aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann1999-11-13 23:19:56 +0000
committerGerd Moellmann1999-11-13 23:19:56 +0000
commit4fefa382f061322a759f496f94059948dc43cf82 (patch)
treefbd305a5033a1887c352134bb3c854f8f7f9d8d2
parentfa52fcb5117f700f6b2c623a643cf8da8047b2e9 (diff)
downloademacs-4fefa382f061322a759f496f94059948dc43cf82.tar.gz
emacs-4fefa382f061322a759f496f94059948dc43cf82.zip
(ansi-color-apply): Updated regexps to include
highlighted face.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ansi-color.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd4449045d8..7f4cd1a0c55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
11999-11-15 Alex Schroeder <alex@gnu.org>
2
3 * ansi-color.el (ansi-color-apply): Updated regexps to include
4 highlighted face.
5
11999-01-15 Johan Vromans <jvromans@squirrel.nl> 61999-01-15 Johan Vromans <jvromans@squirrel.nl>
2 7
3 * forms.el (forms--make-format-elt-using-text-properties): 8 * forms.el (forms--make-format-elt-using-text-properties):
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 7bc747dd04a..746038e32dc 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -4,7 +4,7 @@
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: Alex Schroeder <alex@gnu.org> 6;; Maintainer: Alex Schroeder <alex@gnu.org>
7;; Version: 2.1.1 7;; Version: 2.1.2
8;; Keywords: comm processes 8;; Keywords: comm processes
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
@@ -118,7 +118,7 @@ This function can be added to `comint-preoutput-filter-functions'."
118 (result) 118 (result)
119 (params)) 119 (params))
120 ;; find the next escape sequence 120 ;; find the next escape sequence
121 (while (setq end (string-match "\033\\[\\([01347][01234567]?;\\)*[01347][01234567]?m" string start)) 121 (while (setq end (string-match "\033\\[\\([013457][01234567]?;\\)*[013457][01234567]?m" string start))
122 ;; store escape sequence 122 ;; store escape sequence
123 (setq escape (match-string 0 string)) 123 (setq escape (match-string 0 string))
124 ;; colorize the old block from start to end using old face 124 ;; 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'."
127 (setq result (concat result (substring string start end))) 127 (setq result (concat result (substring string start end)))
128 ;; create new face by applying all the parameters in the escape sequence 128 ;; create new face by applying all the parameters in the escape sequence
129 (let ((i 0)) 129 (let ((i 0))
130 (while (setq i (string-match "[01347][01234567]?[;m]" escape i)) 130 (while (setq i (string-match "[013457][01234567]?[;m]" escape i))
131 (setq face (ansi-color-make-face face 131 (setq face (ansi-color-make-face face
132 (aref escape i) 132 (aref escape i)
133 (aref escape (1+ i)))) 133 (aref escape (1+ i))))