From: Miles Bader <miles@gnu.org>
Date: Tue, 24 Jun 2008 04:52:51 +0000 (+0000)
Subject: Handle void selection in mouse-appearance-menu
X-Git-Tag: emacs-pretest-23.0.90~4558
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=520713e78624a0a29e52b8f354287e084123eee0;p=emacs.git

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 4d40fb44666..439b08e0170 100644
--- 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 21f80cbe613..ce1bc30b1d4 100644
--- 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