aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-hooks.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb25996ffca..35141b6557e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-24 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc/vc-hooks.el (vc-state-base-face): Don't override
4 mode-line-inactive.
5
12014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 62014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * net/eww.el (eww-set-character-encoding): Use `read-coding-system'. 8 * net/eww.el (eww-set-character-encoding): Use `read-coding-system'.
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index a084f9da73a..9a277db8e0f 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -41,7 +41,7 @@
41 :version "25.1") 41 :version "25.1")
42 42
43(defface vc-state-base-face 43(defface vc-state-base-face
44 '((default :inherit mode-line)) 44 '((default))
45 "Base face for VC state indicator." 45 "Base face for VC state indicator."
46 :group 'vc-faces 46 :group 'vc-faces
47 :group 'mode-line 47 :group 'mode-line