xemacs-beta: lisp/easymenu.el comparison

comparison lisp/easymenu.el @ 3230:012240027a21

[xemacs-hg @ 2006-02-05 19:20:44 by aidan] Address easymenu bug.

author	aidan
date	Sun, 05 Feb 2006 19:20:44 +0000
parents	263a354405ed
children	cd167465bf69 308d34e9f07d

comparison

equal deleted inserted replaced

-:5e523c853d06
+:012240027a21
 ;;; easymenu.el - Easy menu support for Emacs 19 and XEmacs.
-;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994, 1995, 2005 Free Software Foundation, Inc.
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: internal, extensions, dumped
 (defun easy-menu-change (&rest args)
 (when (featurep 'menubar)
 (apply 'add-menu args)))
-;; This variable hold the easy-menu mode menus of all major and
+(defvar easy-menu-all-popups nil
-;; minor modes currently in effect in the current buffer.
+"This variable holds all the popup menus easy-menu knows about.
-(defvar easy-menu-all-popups nil)
+This includes any menu created with `easy-menu-add' and any
+non-default value for `mode-popup-menu' that existed when
+`easy-menu-add' was first called.")
 (make-variable-buffer-local 'easy-menu-all-popups)
 (defun easy-menu-add (menu &optional map)
 "Add MENU to the current menu bar."
-(when (featurep 'menubar)
+;; If you uncomment the following, do an xemacs -vanilla, type M-x
-(unless (member menu easy-menu-all-popups)
+;; folding-mode RET, you'll see that this code, which theoretically has
-(push menu easy-menu-all-popups))
+;; *scratch* as its buffer context, can't see *scratch*'s value for
-(setq mode-popup-menu (if (> (length easy-menu-all-popups) 1)
+;; mode-popup-menu--the default overrides it.
-			      (cons (easy-menu-title)
+;;
-				    (reverse easy-menu-all-popups))
+;; This is not specific to *scratch*--try it on ~/.xemacs/init.el--but it
-			    (let ((same-as-menu
+;; does appear to be specific to the first time mode-popup-menu is
-				   (car easy-menu-all-popups)))
+;; accessed as a buffer-local variable in non-interactive code (that is,
-			      (cons (normalize-menu-text
+;; M-: mode-popup-menu RET gives the correct value).
-				     (car same-as-menu))
+;;
-				    (cdr same-as-menu)))))
+;; My fixing this right now isn't going to happen. Aidan Kehoe, 2006-01-03
+;    (message (concat "inside easy-menu-add, menu is %s, "
+;  		   "mode-popup-menu is %s, current buffer is %s, "
+;  		   "default-value mode-popup-menu is %s, "
+;  		   "easy-menu-all-popups is %s")
+;  	   menu mode-popup-menu (current-buffer)
+;  	   (default-value 'mode-popup-menu) easy-menu-all-popups)
+(when (featurep 'menubar)
+;; Save the existing mode-popup-menu, if it's been changed.
+(when (and (zerop (length easy-menu-all-popups))
+	       (not (equal (default-value 'mode-popup-menu) mode-popup-menu)))
+(push mode-popup-menu easy-menu-all-popups))
+;; Add the menu to our list of all the popups for the buffer.
+(pushnew menu easy-menu-all-popups :test 'equal)
+;; If there are multiple popup menus available, make the popup menu
+;; normally shown with button-3 a menu of them. If there is just one,
+;; make that button show it, and no super-menu.
+(setq mode-popup-menu (if (= 1 (length easy-menu-all-popups))
+			      (car easy-menu-all-popups)
+			    (cons (easy-menu-title)
+				(reverse easy-menu-all-popups))))
 (cond ((null current-menubar)
 	   ;; Don't add it to a non-existing menubar.
 	   nil)
 	  ((assoc (car menu) current-menubar)
 	   ;; Already present.
 	   (add-menu nil (car menu) (cdr menu))))))
 (defun easy-menu-remove (menu)
 "Remove MENU from the current menu bar."
 (when (featurep 'menubar)
-(setq easy-menu-all-popups (delq menu easy-menu-all-popups)
+(setq
-	  mode-popup-menu (if (> (length easy-menu-all-popups) 1)
+;; Remove this menu from the list of popups we know about.
-			      (cons (easy-menu-title)
+easy-menu-all-popups (delq menu easy-menu-all-popups)
-				    (reverse easy-menu-all-popups))
+;; If there are multiple popup menus available, make the popup menu
-			    (let ((same-as-menu
+;; normally shown with button-3 a menu of them. If there is just one,
-				   (car easy-menu-all-popups)))
+;; make that button show it, and no super-menu.
-			      (cons (normalize-menu-text
+mode-popup-menu (if (= 1 (length easy-menu-all-popups))
-				     (car same-as-menu))
+			 (car easy-menu-all-popups)
-				    (cdr same-as-menu)))))
+		       (cons (easy-menu-title)
+			     (reverse easy-menu-all-popups))))
+;; If we've just set mode-popup-menu to an empty menu, change that menu
+;; to its default value (without intervention from easy-menu).
+(if (zerop (length easy-menu-all-popups))
+	(setq mode-popup-menu (default-value 'mode-popup-menu)))
 (and current-menubar
 	 (assoc (car menu) current-menubar)
 	 (delete-menu-item (list (car menu))))))
 (defsubst easy-menu-normalize (menu)
 The return value can be used as an argument to `easy-menu-add-item'."
 (when (featurep 'menubar)
 (delete-menu-item (append path (list name))
 		      (easy-menu-normalize menu))))
+;; Think up a good title for the menu.  Take the major-mode of the buffer,
+;; strip the -mode part, convert hyphens to spaces, and capitalize it.
-;; Think up a good title for the menu.  Take the major-mode of the
-;; buffer, strip the -mode part, convert hyphens to spaces, and
-;; capitalize it.
 ;;
-;; If you can think of something smarter, feel free to replace it.
+;; In a more ideal world, we could use `mode-name' here, which see, but that
-;; Don't forget to mail the change to xemacs@xemacs.org where everyone
+;; turns out to be temporarily trashed by various minor modes, and this
-;; can flame, er, praise your changes.
+;; value is much more trustworthy.
 (defun easy-menu-title ()
 (capitalize (replace-in-string (replace-in-string
 				  (symbol-name major-mode) "-mode$" "")
 				 "-" " ")))

Mercurial > hg > xemacs-beta

comparison lisp/easymenu.el @ 3230:012240027a21