From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 13 Sep 2005 20:13:31 +0000 (+0000)
Subject: 2005-09-14  Chong Yidong  <cyd@stupidchicken.com>
X-Git-Tag: emacs-pretest-22.0.90~7118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=40cfe0d8bcc1ea04b3e55b577ed5c1c3df623074;p=emacs.git

2005-09-14  Chong Yidong  <cyd@stupidchicken.com>

	* mouse.el (mouse-major-mode-menu): Make `prefix' optional.
	Delete unused local var.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31b7bb49bf1..94f9f4cf37e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-14  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-major-mode-menu): Make `prefix' optional.
+	Delete unused local var.
+
 2005-09-13  Juanma Barranquero  <lekktu@gmail.com>
 
 	* help-fns.el (describe-categories): "?\ " -> "?\s".
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 1970fbf1eeb..3b591694cfe 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -153,7 +153,7 @@ PREFIX is the prefix argument (if any) to pass to the command."
 
 (defvar mouse-major-mode-menu-prefix)	; dynamically bound
 
-(defun mouse-major-mode-menu (event prefix)
+(defun mouse-major-mode-menu (event &optional prefix)
   "Pop up a mode-specific menu of mouse commands.
 Default to the Edit menu if the major mode doesn't define a menu."
   ;; Switch to the window clicked on, because otherwise
@@ -173,8 +173,7 @@ Default to the Edit menu if the major mode doesn't define a menu."
 	 ;; default to the edit menu.
 	 (newmap (if ancestor
 		     (make-sparse-keymap (concat mode-name " Mode"))
-		   menu-bar-edit-menu))
-	 result)
+		   menu-bar-edit-menu)))
     (if ancestor
 	;; Make our menu inherit from the desired keymap which we want
 	;; to display as the menu now.