aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/ansi-color.el3
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0791284bca..7ce4ad1a3ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12014-03-09 Juri Linkov <juri@jurta.org>
2
3 * ansi-color.el (ansi-color-names-vector): Copy default colors
4 from `xterm-standard-colors' that look well on the default white
5 background (and also on the black background) to avoid illegible
6 color combinations like yello-on-white and white-on-white.
7 http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00157.html
8
12014-03-08 Juanma Barranquero <lekktu@gmail.com> 92014-03-08 Juanma Barranquero <lekktu@gmail.com>
2 10
3 * frameset.el (frameset-restore): When no frame is visible, do not 11 * frameset.el (frameset-restore): When no frame is visible, do not
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 0ab811c7205..4a18c05a880 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -117,7 +117,7 @@ map. This color map is stored in the variable `ansi-color-map'."
117 :group 'ansi-colors) 117 :group 'ansi-colors)
118 118
119(defcustom ansi-color-names-vector 119(defcustom ansi-color-names-vector
120 ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"] 120 ["black" "red3" "green3" "yellow3" "blue2" "magenta3" "cyan3" "gray90"]
121 "Colors used for SGR control sequences determining a color. 121 "Colors used for SGR control sequences determining a color.
122This vector holds the colors used for SGR control sequences parameters 122This vector holds the colors used for SGR control sequences parameters
12330 to 37 (foreground colors) and 40 to 47 (background colors). 12330 to 37 (foreground colors) and 40 to 47 (background colors).
@@ -147,6 +147,7 @@ foreground and background colors, respectively."
147 (choice color (cons color color))) 147 (choice color (cons color color)))
148 :set 'ansi-color-map-update 148 :set 'ansi-color-map-update
149 :initialize 'custom-initialize-default 149 :initialize 'custom-initialize-default
150 :version "24.4" ; default colors copied from `xterm-standard-colors'
150 :group 'ansi-colors) 151 :group 'ansi-colors)
151 152
152(defconst ansi-color-regexp "\033\\[\\([0-9;]*m\\)" 153(defconst ansi-color-regexp "\033\\[\\([0-9;]*m\\)"