* ansi-color.el: Delete unused escape sequences (Bug#6085).
(ansi-color-drop-regexp): New constant. (ansi-color-apply, ansi-color-filter-region) (ansi-color-apply-on-region): Delete unrecognized control sequences. (ansi-color-apply): Build string list before calling concat.
This commit is contained in:
Chong Yidong
parent
db5dce9dd1
commit
bc8d33d540
2 changed files with 64 additions and 37 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2010-05-29 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* ansi-color.el: Delete unused escape sequences (Bug#6085).
|
||||
(ansi-color-drop-regexp): New constant.
|
||||
(ansi-color-apply, ansi-color-filter-region)
|
||||
(ansi-color-apply-on-region): Delete unrecognized control
|
||||
sequences.
|
||||
(ansi-color-apply): Build string list before calling concat.
|
||||
|
||||
2010-05-29 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Bidi-sensitive word movement with arrow keys.
|
||||
|
|
|
|||
|
|
@ -142,6 +142,10 @@ map. This color map is stored in the variable `ansi-color-map'."
|
|||
(defconst ansi-color-regexp "\033\\[\\([0-9;]*m\\)"
|
||||
"Regexp that matches SGR control sequences.")
|
||||
|
||||
(defconst ansi-color-drop-regexp
|
||||
"\033\\[\\([ABCDsuK]\\|2J\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)"
|
||||
"Regexp that matches ANSI control sequences to silently drop.")
|
||||
|
||||
(defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]"
|
||||
"Regexp that matches SGR control sequence parameters.")
|
||||
|
||||
|
|
@ -154,7 +158,7 @@ map. This color map is stored in the variable `ansi-color-map'."
|
|||
If nil, do nothing.
|
||||
If the symbol `filter', then filter all SGR control sequences.
|
||||
If anything else (such as t), then translate SGR control sequences
|
||||
into text-properties.
|
||||
into text properties.
|
||||
|
||||
In order for this to have any effect, `ansi-color-process-output' must
|
||||
be in `comint-output-filter-functions'.
|
||||
|
|
@ -188,12 +192,12 @@ in shell buffers. You set this variable by calling one of:
|
|||
|
||||
;;;###autoload
|
||||
(defun ansi-color-process-output (ignored)
|
||||
"Maybe translate SGR control sequences of comint output into text-properties.
|
||||
"Maybe translate SGR control sequences of comint output into text properties.
|
||||
|
||||
Depending on variable `ansi-color-for-comint-mode' the comint output is
|
||||
either not processed, SGR control sequences are filtered using
|
||||
`ansi-color-filter-region', or SGR control sequences are translated into
|
||||
text-properties using `ansi-color-apply-on-region'.
|
||||
text properties using `ansi-color-apply-on-region'.
|
||||
|
||||
The comint output is assumed to lie between the marker
|
||||
`comint-last-output-start' and the process-mark.
|
||||
|
|
@ -217,15 +221,15 @@ This is a good function to put in `comint-output-filter-functions'."
|
|||
(defun ansi-color-unfontify-region (beg end &rest xemacs-stuff)
|
||||
"Replacement function for `font-lock-default-unfontify-region'.
|
||||
|
||||
As text-properties are implemented using extents in XEmacs, this
|
||||
As text properties are implemented using extents in XEmacs, this
|
||||
function is probably not needed. In Emacs, however, things are a bit
|
||||
different: When font-lock is active in a buffer, you cannot simply add
|
||||
face text-properties to the buffer. Font-lock will remove the face
|
||||
text-property using `font-lock-unfontify-region-function'. If you want
|
||||
face text properties to the buffer. Font-lock will remove the face
|
||||
text property using `font-lock-unfontify-region-function'. If you want
|
||||
to insert the strings returned by `ansi-color-apply' into such buffers,
|
||||
you must set `font-lock-unfontify-region-function' to
|
||||
`ansi-color-unfontify-region'. This function will not remove all face
|
||||
text-properties unconditionally. It will keep the face text-properties
|
||||
text properties unconditionally. It will keep the face text properties
|
||||
if the property `ansi-color' is set.
|
||||
|
||||
The region from BEG to END is unfontified. XEMACS-STUFF is ignored.
|
||||
|
|
@ -262,7 +266,7 @@ escape sequence.")
|
|||
(make-variable-buffer-local 'ansi-color-context)
|
||||
|
||||
(defun ansi-color-filter-apply (string)
|
||||
"Filter out all SGR control sequences from STRING.
|
||||
"Filter out all ANSI control sequences from STRING.
|
||||
|
||||
Every call to this function will set and use the buffer-local variable
|
||||
`ansi-color-context' to save partial escape sequences. This information
|
||||
|
|
@ -292,10 +296,11 @@ This function can be added to `comint-preoutput-filter-functions'."
|
|||
result))
|
||||
|
||||
(defun ansi-color-apply (string)
|
||||
"Translates SGR control sequences into text-properties.
|
||||
"Translates SGR control sequences into text properties.
|
||||
Delete all other control sequences without processing them.
|
||||
|
||||
Applies SGR control sequences setting foreground and background colors
|
||||
to STRING using text-properties and returns the result. The colors used
|
||||
to STRING using text properties and returns the result. The colors used
|
||||
are given in `ansi-color-faces-vector' and `ansi-color-names-vector'.
|
||||
See function `ansi-color-apply-sequence' for details.
|
||||
|
||||
|
|
@ -309,23 +314,27 @@ This function can be added to `comint-preoutput-filter-functions'.
|
|||
You cannot insert the strings returned into buffers using font-lock.
|
||||
See `ansi-color-unfontify-region' for a way around this."
|
||||
(let ((face (car ansi-color-context))
|
||||
(start 0) end escape-sequence result)
|
||||
;; if context was saved and is a string, prepend it
|
||||
(start 0) end escape-sequence result
|
||||
colorized-substring)
|
||||
;; If context was saved and is a string, prepend it.
|
||||
(if (cadr ansi-color-context)
|
||||
(setq string (concat (cadr ansi-color-context) string)
|
||||
ansi-color-context nil))
|
||||
;; find the next escape sequence
|
||||
;; Find the next escape sequence.
|
||||
(while (setq end (string-match ansi-color-regexp string start))
|
||||
;; store escape sequence
|
||||
(setq escape-sequence (match-string 1 string))
|
||||
;; colorize the old block from start to end using old face
|
||||
;; Colorize the old block from start to end using old face.
|
||||
(when face
|
||||
(put-text-property start end 'ansi-color t string)
|
||||
(put-text-property start end 'face face string))
|
||||
(setq result (concat result (substring string start end))
|
||||
(setq colorized-substring (substring string start end)
|
||||
start (match-end 0))
|
||||
;; create new face by applying all the parameters in the escape
|
||||
;; sequence
|
||||
;; Eliminate unrecognized ANSI sequences.
|
||||
(while (string-match ansi-color-drop-regexp colorized-substring)
|
||||
(setq colorized-substring
|
||||
(replace-match "" nil nil colorized-substring)))
|
||||
(push colorized-substring result)
|
||||
;; Create new face, by applying escape sequence parameters.
|
||||
(setq face (ansi-color-apply-sequence escape-sequence face)))
|
||||
;; if the rest of the string should have a face, put it there
|
||||
(when face
|
||||
|
|
@ -335,13 +344,13 @@ See `ansi-color-unfontify-region' for a way around this."
|
|||
(let (fragment)
|
||||
(if (string-match "\033" string start)
|
||||
(let ((pos (match-beginning 0)))
|
||||
(setq fragment (substring string pos)
|
||||
result (concat result (substring string start pos))))
|
||||
(setq result (concat result (substring string start))))
|
||||
(setq fragment (substring string pos))
|
||||
(push (substring string start pos) result))
|
||||
(push (substring string start) result))
|
||||
(if (or face fragment)
|
||||
(setq ansi-color-context (list face fragment))
|
||||
(setq ansi-color-context nil)))
|
||||
result))
|
||||
(apply 'concat (nreverse result))))
|
||||
|
||||
;; Working with regions
|
||||
|
||||
|
|
@ -354,7 +363,7 @@ position processed.")
|
|||
(make-variable-buffer-local 'ansi-color-context-region)
|
||||
|
||||
(defun ansi-color-filter-region (begin end)
|
||||
"Filter out all SGR control sequences from region BEGIN to END.
|
||||
"Filter out all ANSI control sequences from region BEGIN to END.
|
||||
|
||||
Every call to this function will set and use the buffer-local variable
|
||||
`ansi-color-context-region' to save position. This information will be
|
||||
|
|
@ -365,23 +374,27 @@ it will override BEGIN, the start of the region. Set
|
|||
(start (or (cadr ansi-color-context-region) begin)))
|
||||
(save-excursion
|
||||
(goto-char start)
|
||||
;; find the next escape sequence
|
||||
(while (re-search-forward ansi-color-regexp end-marker t)
|
||||
;; delete the escape sequence
|
||||
;; Delete unrecognized escape sequences.
|
||||
(while (re-search-forward ansi-color-drop-regexp end-marker t)
|
||||
(replace-match ""))
|
||||
;; save context, add the remainder of the string to the result
|
||||
(if (re-search-forward "\033" end-marker t)
|
||||
(setq ansi-color-context-region (list nil (match-beginning 0)))
|
||||
(setq ansi-color-context-region nil)))))
|
||||
(goto-char start)
|
||||
;; Delete SGR escape sequences.
|
||||
(while (re-search-forward ansi-color-regexp end-marker t)
|
||||
(replace-match ""))
|
||||
;; save context, add the remainder of the string to the result
|
||||
(if (re-search-forward "\033" end-marker t)
|
||||
(setq ansi-color-context-region (list nil (match-beginning 0)))
|
||||
(setq ansi-color-context-region nil)))))
|
||||
|
||||
(defun ansi-color-apply-on-region (begin end)
|
||||
"Translates SGR control sequences into overlays or extents.
|
||||
Delete all other control sequences without processing them.
|
||||
|
||||
Applies SGR control sequences setting foreground and background colors
|
||||
to text in region between BEGIN and END using extents or overlays.
|
||||
Emacs will use overlays, XEmacs will use extents. The colors used are
|
||||
given in `ansi-color-faces-vector' and `ansi-color-names-vector'. See
|
||||
function `ansi-color-apply-sequence' for details.
|
||||
SGR control sequences are applied by setting foreground and
|
||||
background colors to the text between BEGIN and END using
|
||||
overlays. The colors used are given in `ansi-color-faces-vector'
|
||||
and `ansi-color-names-vector'. See `ansi-color-apply-sequence'
|
||||
for details.
|
||||
|
||||
Every call to this function will set and use the buffer-local variable
|
||||
`ansi-color-context-region' to save position and current face. This
|
||||
|
|
@ -394,11 +407,16 @@ start of the region and set the face with which to start. Set
|
|||
(copy-marker begin)))
|
||||
(end-marker (copy-marker end))
|
||||
escape-sequence)
|
||||
;; First, eliminate unrecognized ANSI control sequences.
|
||||
(save-excursion
|
||||
(goto-char start-marker)
|
||||
;; find the next escape sequence
|
||||
(while (re-search-forward ansi-color-drop-regexp end-marker t)
|
||||
(replace-match "")))
|
||||
(save-excursion
|
||||
(goto-char start-marker)
|
||||
;; Find the next SGR sequence.
|
||||
(while (re-search-forward ansi-color-regexp end-marker t)
|
||||
;; colorize the old block from start to end using old face
|
||||
;; Colorize the old block from start to end using old face.
|
||||
(when face
|
||||
(ansi-color-set-extent-face
|
||||
(ansi-color-make-extent start-marker (match-beginning 0))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue