From: czkmt <czkmt>
Date: Tue, 30 Nov 1999 15:04:14 +0000 (+0000)
Subject: (gnus-offline-define-menu-and-key): Fix a bug -- do add-hook.
X-Git-Tag: t-gnus-6_13_3-09~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5e00c635a81367f7607cca51dee83e550fa85044;p=elisp%2Fgnus.git-

(gnus-offline-define-menu-and-key): Fix a bug -- do add-hook.
(gnus-offline-popup): Examine whether `easy-menu-create-menu' is
defined. If not, call `easy-menu-create-keymaps'.
---

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index c3ad079..0510161 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -858,9 +858,12 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 			      (throw 'tag nil)))
 			  gnus-group-toolbar)))))
    (t
-    (define-key gnus-group-mode-map
-      (static-if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
-      'gnus-offline-popup-menu))))
+    (add-hook
+     'gnus-group-mode-hook
+     `(lambda ()
+	(define-key gnus-group-mode-map
+	  ,(static-if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
+	  'gnus-offline-popup-menu))))))
 ;;
 ;;
 (defun gnus-offline-popup (menu &optional title)
@@ -868,7 +871,10 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
    ((featurep 'xemacs)
     (popup-menu menu))
    (t
-    (let (keymap keymap pop func)
+    (let ((menu-func (or (and (fboundp 'easy-menu-create-menu)
+			      'easy-menu-create-menu)
+			 'easy-menu-create-keymaps))
+	  keymap pop func)
       (static-cond ((< emacs-major-version 20)
 		    ;; For Emacsen from 19.34 down to 19.28.
 		    ;; Seems the first item in MENU will be ignored.
@@ -888,18 +894,17 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 					    '(nil "")
 					    '(nil ""))
 				      (cdr menu))
-			    (easy-menu-create-keymaps (car menu)
-						      (cdr menu)))))
+			    (funcall menu-func (car menu) (cdr menu)))))
 		   (t
-		    (if (keymapp menu)
-			(setq keymap menu)
-		      (easy-menu-define keymap nil "" menu))))
+		    (setq keymap
+			  (if (keymapp menu)
+			      menu
+			    (funcall menu-func (car menu) (cdr menu))))))
       ;; Display the popup menu.
       (if (and (setq pop (x-popup-menu t keymap))
 	       (setq func (lookup-key keymap
 				      (apply 'vector pop))))
-	  (prog1 keymap
-	    (funcall func)))))))
+	  (funcall func))))))
 
 (defun gnus-offline-get-menu-items (list)
   (mapcar