Handle void selection in mouse-appearance-menu

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1281

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d40fb44666e8acb7b8ce2eb54ee760073253005..439b08e017068afe657280e09e186d743008a05c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-24  Miles Bader  <miles@gnu.org>
+
+       * mouse.el (mouse-appearance-menu): Don't do anything if the user
+       pops up the menu but doesn't select anything.
+
 2008-06-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * add-log.el (add-change-log-entry): Add new arg to force each new

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 21f80cbe613a8cd6a79e7e4035590b6bd0d70c19..ce1bc30b1d4ae9c06329fe6ff56008dc104d479c 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2524,7 +2524,7 @@ choose a font."
              ((eq choice 'face-remap-reset-base)
               (text-scale-mode 0)
               (buffer-face-mode 0))
-             (t
+             (choice
               ;; Either choice == 'x-select-font, or choice is a
               ;; symbol whose name is a font.
               (buffer-face-mode-invoke (font-face-attributes