summaryrefslogtreecommitdiff
path: root/lisp/facemenu.el
diff options
context:
space:
mode:
authorBoris Goldowsky <boris@gnu.org>1995-02-14 15:00:40 +0000
committerBoris Goldowsky <boris@gnu.org>1995-02-14 15:00:40 +0000
commit8dc99b5b2ce50028840f9103af4656627afe50f2 (patch)
tree0883c2bd565037956ff992b78438684d48e44449 /lisp/facemenu.el
parent5f76676ce57eda3566c7d6c9af6d47b2240daaa8 (diff)
downloademacs-8dc99b5b2ce50028840f9103af4656627afe50f2.tar.gz
(facemenu-self-insert-face): If previous
self-insert-face is still valid, add to rather than replace it.
Diffstat (limited to 'lisp/facemenu.el')
-rw-r--r--lisp/facemenu.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 706cf49d39f..b7307b6e3e3 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -216,8 +216,6 @@ requested in `facemenu-keybindings'.")
"Alist of colors, used for completion.
If null, `facemenu-read-color' will set it.")
-(defvar facemenu-loc nil)
-
(defun facemenu-update ()
"Add or update the \"Face\" menu in the menu bar.
You can call this to update things if you change any of the menu configuration
@@ -302,7 +300,11 @@ typing a character cancels the request."
(facemenu-self-insert-face face)))
(defun facemenu-self-insert-face (face)
- (setq self-insert-face face
+ (setq self-insert-face (if (eq last-command self-insert-face-command)
+ (cons face (if (listp self-insert-face)
+ self-insert-face
+ (list self-insert-face)))
+ face)
self-insert-face-command this-command))
(defun facemenu-set-invisible (start end)