summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/ansi-color.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 476c0593855..f51947ffac4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2013-10-16 Glenn Morris <rgm@gnu.org>
+ * ansi-color.el (ansi-color-drop-regexp):
+ Add 1J, 1K, 2K. (Bug#15617)
+
* files.el (hack-local-variables--warned-lexical): New.
(hack-local-variables):
Warn about misplaced lexical-binding. (Bug#15616)
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 105352117b7..a5978144e9b 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -153,7 +153,7 @@ foreground and background colors, respectively."
"Regexp that matches SGR control sequences.")
(defconst ansi-color-drop-regexp
- "\033\\[\\([ABCDsuK]\\|2J\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)"
+ "\033\\[\\([ABCDsuK]\\|[12][JK]\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)"
"Regexp that matches ANSI control sequences to silently drop.")
(defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]"