(ansi-color-apply): Updated regexps to include

highlighted face.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd4449045d890215ebad44eda9a2a94b99837109..7f4cd1a0c552cfc2b2b7b3d1499e8378d251ddb6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-15  Alex Schroeder  <alex@gnu.org>
+
+       * ansi-color.el (ansi-color-apply): Updated regexps to include
+       highlighted face.
+       
 1999-01-15  Johan Vromans  <jvromans@squirrel.nl>
 
        * forms.el (forms--make-format-elt-using-text-properties): 

diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 7bc747dd04a5d8194baf8a0ed4bedc3c044567b8..746038e32dc43b32b8a47f9ef46f951dbb4ec9a8 100644 (file)
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -4,7 +4,7 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
-;; Version: 2.1.1
+;; Version: 2.1.2
 ;; Keywords: comm processes
 
 ;; This file is part of GNU Emacs.
@@ -118,7 +118,7 @@ This function can be added to `comint-preoutput-filter-functions'."
        (result)
        (params))
     ;; find the next escape sequence
-    (while (setq end (string-match "\033\\[\\([01347][01234567]?;\\)*[01347][01234567]?m" string start))
+    (while (setq end (string-match "\033\\[\\([013457][01234567]?;\\)*[013457][01234567]?m" string start))
       ;; store escape sequence
       (setq escape (match-string 0 string))
       ;; colorize the old block from start to end using old face
@@ -127,7 +127,7 @@ This function can be added to `comint-preoutput-filter-functions'."
       (setq result (concat result (substring string start end)))
       ;; create new face by applying all the parameters in the escape sequence
       (let ((i 0))
-       (while (setq i (string-match "[01347][01234567]?[;m]" escape i))
+       (while (setq i (string-match "[013457][01234567]?[;m]" escape i))
          (setq face (ansi-color-make-face face
                                           (aref escape i)
                                           (aref escape (1+ i))))