X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fmenubar.el;h=917b49c269ccb718167da577f831b0265b5cfb12;hp=44c5b6adc38cbe240057fc60cf3c6104ccd06159;hb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;hpb=c740b47fa11cbfe4416bbcfb991ad714f82610a8

diff --git a/lisp/menubar.el b/lisp/menubar.el
index 44c5b6a..917b49c 100644
--- a/lisp/menubar.el
+++ b/lisp/menubar.el
@@ -523,35 +523,40 @@ button was clicked."
 				     (extent-property extent 'context-menu))
 				 context-extents))))
     (popup-menu
-     (cond ((and global-popup-menu mode-popup-menu)
+     (progn
 	    ;; Merge global-popup-menu and mode-popup-menu
-	    (check-menu-syntax mode-popup-menu)
-	    (let* ((title (car mode-popup-menu))
-		   (items (cdr mode-popup-menu))
+	    (and mode-popup-menu (check-menu-syntax mode-popup-menu))
+	    (let* ((mode-title (and (stringp (car mode-popup-menu))
+				    (car mode-popup-menu)))
+		   (mode-items (if mode-title (cdr mode-popup-menu)
+				 mode-popup-menu))
+		   (global-title (and (stringp (car global-popup-menu))
+				      (car global-popup-menu)))
+		   (global-items (if global-title (cdr global-popup-menu)
+				   global-popup-menu))
 		   mode-filters)
 	      ;; Strip keywords from local menu for attaching them at the top
-	      (while (and items
-			  (keywordp (car items)))
+	      (while (and mode-items
+			  (keywordp (car mode-items)))
 		;; Push both keyword and its argument.
-		(push (pop items) mode-filters)
-		(push (pop items) mode-filters))
+		(push (pop mode-items) mode-filters)
+		(push (pop mode-items) mode-filters))
 	      (setq mode-filters (nreverse mode-filters))
 	      ;; If mode-filters contains a keyword already present in
 	      ;; `global-popup-menu', you will probably lose.
-	      (append (list (car global-popup-menu))
+	      (append (and popup-menu-titles
+			   (cond (mode-title (list mode-title))
+				 (global-title (list global-title))
+				 (t "")))
 		      mode-filters
-		      (cdr global-popup-menu)
-		      '("---" "---")
-		      (if popup-menu-titles (list title))
-		      (if popup-menu-titles '("---" "---"))
-		      items
-		      context-menu-items)))
-	   (t
-	    (append
-	     (or mode-popup-menu
-		 global-popup-menu
-		 (error "No menu defined in this buffer"))
-	     context-menu-items))))
+		      context-menu-items
+		      (and context-menu-items mode-items '("---"))
+		      mode-items
+		      (and (or context-menu-items mode-items)
+			   global-items '("---" "---"))
+		      (and global-title (list global-title))
+		      global-items
+		      ))))
 
     (while (popup-up-p)
       (dispatch-event (next-event)))