[Emacs-diffs] emacs/lisp ChangeLog ansi-color.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/03/30 15:35:54

Modified files:
        lisp           : ChangeLog ansi-color.el 

Log message:
        (ansi-color-get-face): Use
        ansi-color-parameter-regexp to match parameters.
        (ansi-color-regexp): Include final `m' in first group.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15536&r2=1.15537
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ansi-color.el?cvsroot=emacs&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15536
retrieving revision 1.15537
diff -u -b -r1.15536 -r1.15537
--- ChangeLog   30 Mar 2009 15:07:08 -0000      1.15536
+++ ChangeLog   30 Mar 2009 15:35:52 -0000      1.15537
@@ -1,3 +1,9 @@
+2009-03-30  Andreas Schwab  <address@hidden>
+
+       * ansi-color.el (ansi-color-get-face): Use
+       ansi-color-parameter-regexp to match parameters.
+       (ansi-color-regexp): Include final `m' in first group.
+
 2009-03-30  Jason Rumney  <address@hidden>
 
        * files.el (locate-dominating-stop-dir-regexp): Stop searching

Index: ansi-color.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ansi-color.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- ansi-color.el       5 Jan 2009 03:18:41 -0000       1.29
+++ ansi-color.el       30 Mar 2009 15:35:54 -0000      1.30
@@ -147,7 +147,7 @@
   :initialize 'custom-initialize-default
   :group 'ansi-colors)
 
-(defconst ansi-color-regexp "\033\\[\\([0-9;]*\\)m"
+(defconst ansi-color-regexp "\033\\[\\([0-9;]*m\\)"
   "Regexp that matches SGR control sequences.")
 
 (defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]"
@@ -614,13 +614,12 @@
 
 ESCAPE-SEQ is a SGR control sequences such as \\033[34m.  The parameter
 34 is used by `ansi-color-get-face-1' to return a face definition."
-  (let ((ansi-color-r "[0-9][0-9]?")
-        (i 0)
+  (let ((i 0)
         f val)
-    (while (string-match ansi-color-r escape-seq i)
+    (while (string-match ansi-color-parameter-regexp escape-seq i)
       (setq i (match-end 0)
            val (ansi-color-get-face-1
-                (string-to-number (match-string 0 escape-seq) 10)))
+                (string-to-number (match-string 1 escape-seq) 10)))
       (cond ((not val))
            ((eq val 'default)
             (setq f (list val)))