aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-15 11:34:27 +0000
committerGerd Moellmann2001-01-15 11:34:27 +0000
commitb3287acf9776f56602f110df5886bf0486e307ae (patch)
treefe1dbff1f8f7248390fb6a4d1963b9d04ae34b2f /lisp
parentf96467d8f24a690daea65b8850f47e67c17af118 (diff)
downloademacs-b3287acf9776f56602f110df5886bf0486e307ae.tar.gz
emacs-b3287acf9776f56602f110df5886bf0486e307ae.zip
(ansi-colors) <defgroup>: Fix :version by Dave
Love <fx@gnu.org> (ansi-color-for-comint-mode): Fix :version. (ansi-color-unfontify-region): Doc change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/ansi-color.el17
2 files changed, 20 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3a80c579ac..de0bc0e5841 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12001-01-15 Alex Schroeder <alex@gnu.org>
2
3 * ansi-color.el (ansi-colors) <defgroup>: Fix :version by Dave
4 Love <fx@gnu.org>
5 (ansi-color-for-comint-mode): Fix :version.
6
72001-01-15 Alex Schroeder <alex@gnu.org>
8
9 * ansi-color.el (ansi-color-unfontify-region): Doc change.
10
12001-01-14 Eli Zaretskii <eliz@is.elta.co.il> 112001-01-14 Eli Zaretskii <eliz@is.elta.co.il>
2 12
3 * dired.el (dired-insert-directory): If file-system-info fails, 13 * dired.el (dired-insert-directory): If file-system-info fails,
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 10503df7ae7..bbc3b774d53 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -4,8 +4,8 @@
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: 3.4.0 7;; Version: 3.4.2
8;; Keywords: comm processes 8;; Keywords: comm processes terminals services
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -172,7 +172,7 @@ in shell buffers. You set this variable by calling one of:
172\\[ansi-color-for-comint-mode-on] 172\\[ansi-color-for-comint-mode-on]
173\\[ansi-color-for-comint-mode-off] 173\\[ansi-color-for-comint-mode-off]
174\\[ansi-color-for-comint-mode-filter]" 174\\[ansi-color-for-comint-mode-filter]"
175 :version "20.8" 175 :version "21.1"
176 :type '(choice (const :tag "Do nothing" nil) 176 :type '(choice (const :tag "Do nothing" nil)
177 (const :tag "Filter" filter) 177 (const :tag "Filter" filter)
178 (const :tag "Translate" t)) 178 (const :tag "Translate" t))
@@ -218,7 +218,7 @@ This is a good function to put in `comint-output-filter-functions'."
218 'ansi-color-process-output) 218 'ansi-color-process-output)
219 219
220 220
221;; Alternative font-lock-unfontify-region-function 221;; Alternative font-lock-unfontify-region-function for Emacs only
222 222
223 223
224(eval-when-compile 224(eval-when-compile
@@ -238,9 +238,12 @@ This is a good function to put in `comint-output-filter-functions'."
238 (put 'save-buffer-state 'lisp-indent-function 1)) 238 (put 'save-buffer-state 'lisp-indent-function 1))
239 239
240(defun ansi-color-unfontify-region (beg end &rest xemacs-stuff) 240(defun ansi-color-unfontify-region (beg end &rest xemacs-stuff)
241 "Replacement function for `font-lock-default-unfontify-region'. 241 "Replacement function for `font-lock-default-unfontify-region'.
242When font-lock is active in a buffer, you cannot simply add face 242
243text-properties to the buffer. Font-lock will remove the face 243As text-properties are implemented using extents in XEmacs, this
244function is probably not needed. In Emacs, however, things are a bit
245different: When font-lock is active in a buffer, you cannot simply add
246face text-properties to the buffer. Font-lock will remove the face
244text-property using `font-lock-unfontify-region-function'. If you want 247text-property using `font-lock-unfontify-region-function'. If you want
245to insert the strings returned by `ansi-color-apply' into such buffers, 248to insert the strings returned by `ansi-color-apply' into such buffers,
246you must set `font-lock-unfontify-region-function' to 249you must set `font-lock-unfontify-region-function' to