unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#7485: 23.2; Fix removing unrecognized ANSI sequences in ansi-color-apply
@ 2010-11-26 14:48 Leo
  2010-11-26 18:55 ` Stefan Monnier
  0 siblings, 1 reply; 4+ messages in thread
From: Leo @ 2010-11-26 14:48 UTC (permalink / raw)
  To: 7485

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

In ansi-color-apply, (string-match "\033" string start) finds the wrong
portion of context if unrecognized ANSI sequences is not removed before
the match.

This can cause, for example, eshell's prompt to disappear if
ansi-color-apply is used in eshell-preoutput-filter-functions. The
attached patch tries to fix this.

Leo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-ansi.diff --]
[-- Type: text/x-diff, Size: 1519 bytes --]

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 146c6c9..8d5cbe1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-26  Leo <sdl.web@gmail.com>
+
+	* ansi-color.el (ansi-color-apply): Also eliminate unrecognized
+	ANSI sequences for remaining string.
+
 2010-10-03  Chong Yidong  <cyd@stupidchicken.com>
 
 	* minibuffer.el (completion--some, completion--do-completion)
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 00162c9..40c0066 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -341,12 +341,15 @@ See `ansi-color-unfontify-region' for a way around this."
       (put-text-property start (length string) 'ansi-color t string)
       (put-text-property start (length string) 'face face string))
     ;; save context, add the remainder of the string to the result
-    (let (fragment)
-      (if (string-match "\033" string start)
+    (let ((remaining (substring string start))
+	  fragment)
+      (while (string-match ansi-color-drop-regexp remaining)
+	(setq remaining (replace-match "" nil nil remaining)))
+      (if (string-match "\033" remaining)
 	  (let ((pos (match-beginning 0)))
-	    (setq fragment (substring string pos))
-	    (push (substring string start pos) result))
-	(push (substring string start) result))
+	    (setq fragment (substring remaining pos))
+	    (push (substring remaining 0 pos) result))
+	(push remaining result))
       (if (or face fragment)
 	  (setq ansi-color-context (list face fragment))
 	(setq ansi-color-context nil)))

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-07-04  1:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-26 14:48 bug#7485: 23.2; Fix removing unrecognized ANSI sequences in ansi-color-apply Leo
2010-11-26 18:55 ` Stefan Monnier
2010-11-26 22:41   ` Leo
2017-07-04  1:48     ` npostavs

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).