aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-10-15 18:38:12 -0700
committerGlenn Morris2013-10-15 18:38:12 -0700
commit0283d6b0afbae2d45a10e95e47d753dd20ce2b04 (patch)
tree2c1bf0c78602cf4210baceeff40924a669f3aa3e
parent012e2f9fdaf39b5f913b5560be3986e2bc599186 (diff)
downloademacs-0283d6b0afbae2d45a10e95e47d753dd20ce2b04.tar.gz
emacs-0283d6b0afbae2d45a10e95e47d753dd20ce2b04.zip
* ansi-color.el (ansi-color-drop-regexp): Add 1J, 1K, 2K.
Fixes: debbugs:15617
-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 @@
12013-10-16 Glenn Morris <rgm@gnu.org> 12013-10-16 Glenn Morris <rgm@gnu.org>
2 2
3 * ansi-color.el (ansi-color-drop-regexp):
4 Add 1J, 1K, 2K. (Bug#15617)
5
3 * files.el (hack-local-variables--warned-lexical): New. 6 * files.el (hack-local-variables--warned-lexical): New.
4 (hack-local-variables): 7 (hack-local-variables):
5 Warn about misplaced lexical-binding. (Bug#15616) 8 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."
153 "Regexp that matches SGR control sequences.") 153 "Regexp that matches SGR control sequences.")
154 154
155(defconst ansi-color-drop-regexp 155(defconst ansi-color-drop-regexp
156 "\033\\[\\([ABCDsuK]\\|2J\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)" 156 "\033\\[\\([ABCDsuK]\\|[12][JK]\\|=[0-9]+[hI]\\|[0-9;]*[Hf]\\)"
157 "Regexp that matches ANSI control sequences to silently drop.") 157 "Regexp that matches ANSI control sequences to silently drop.")
158 158
159(defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]" 159(defconst ansi-color-parameter-regexp "\\([0-9]*\\)[m;]"