aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/face-remap.el16
2 files changed, 19 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d67d626f131..6395bb1aa20 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12014-02-10 Eli Zaretskii <eliz@gnu.org>
2
3 * face-remap.el (face-remap-add-relative)
4 (face-remap-remove-relative, face-remap-reset-base)
5 (face-remap-set-base): Call force-mode-line-update to redisplay
6 the current buffer due to potential change in faces. (Bug#16709)
7
12014-02-10 Michael Albinus <michael.albinus@gmx.de> 82014-02-10 Michael Albinus <michael.albinus@gmx.de>
2 9
3 * net/tramp-sh.el (tramp-sh-handle-vc-registered): Apply heredoc 10 * net/tramp-sh.el (tramp-sh-handle-vc-registered): Apply heredoc
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 0326643453b..f1af4ec6673 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -135,7 +135,9 @@ other than the normal definition of FACE via `face-remap-set-base'."
135 (let ((faces (cdr entry))) 135 (let ((faces (cdr entry)))
136 (if (symbolp faces) 136 (if (symbolp faces)
137 (setq faces (list faces))) 137 (setq faces (list faces)))
138 (setcdr entry (face-remap-order (cons specs faces)))) 138 (setcdr entry (face-remap-order (cons specs faces)))
139 ;; Force redisplay of this buffer.
140 (force-mode-line-update))
139 (cons face specs))) 141 (cons face specs)))
140 142
141(defun face-remap-remove-relative (cookie) 143(defun face-remap-remove-relative (cookie)
@@ -150,7 +152,9 @@ COOKIE should be the return value from that function."
150 (and (eq (car-safe updated-entries) (car cookie)) 152 (and (eq (car-safe updated-entries) (car cookie))
151 (null (cdr updated-entries)))) 153 (null (cdr updated-entries))))
152 (setq face-remapping-alist 154 (setq face-remapping-alist
153 (remq remapping face-remapping-alist))) 155 (remq remapping face-remapping-alist))
156 ;; Force redisplay of this buffer.
157 (force-mode-line-update))
154 (cdr cookie)))))) 158 (cdr cookie))))))
155 159
156;;;###autoload 160;;;###autoload
@@ -167,7 +171,9 @@ to apply on top of the normal definition of FACE."
167 (if (null (cddr entry)) ; nothing except base remapping 171 (if (null (cddr entry)) ; nothing except base remapping
168 (setq face-remapping-alist ; so remove entire entry 172 (setq face-remapping-alist ; so remove entire entry
169 (remq entry face-remapping-alist)) 173 (remq entry face-remapping-alist))
170 (setcar (last entry) face))))) ; otherwise, just inherit global def 174 (setcar (last entry) face))
175 ;; Force redisplay of this buffer.
176 (force-mode-line-update)))) ; otherwise, just inherit global def
171 177
172;;;###autoload 178;;;###autoload
173(defun face-remap-set-base (face &rest specs) 179(defun face-remap-set-base (face &rest specs)
@@ -194,7 +200,9 @@ not to inherit from the global definition of FACE at all."
194 (let ((entry (assq face face-remapping-alist))) 200 (let ((entry (assq face face-remapping-alist)))
195 (if entry 201 (if entry
196 (setcar (last entry) specs) ; overwrite existing base entry 202 (setcar (last entry) specs) ; overwrite existing base entry
197 (push (list face specs) face-remapping-alist))))) 203 (push (list face specs) face-remapping-alist)))
204 ;; Force redisplay of this buffer.
205 (force-mode-line-update)))
198 206
199 207
200;; ---------------------------------------------------------------- 208;; ----------------------------------------------------------------