From: yamaoka <yamaoka>
Date: Sun, 10 Jan 1999 23:08:55 +0000 (+0000)
Subject: ;; Commit by Tsukamoto-san by way of yamaoka.
X-Git-Tag: gnus-6_10-199901111900~6
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad485c96d9eeb2d8bb5b613a04bfdec934ca71fe;p=elisp%2Fgnus.git-

;; Commit by Tsukamoto-san by way of yamaoka.
* (gnus-offline-popup-menu): Bug fix -- Use `gnus-offline-menu-on-agent' if
`miee-popup-menu' does not exits.
---

diff --git a/ChangeLog b/ChangeLog
index 784a440..d470e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-09  Tsukamoto Tetsuo  <czkmt@remus.dti.ne.jp>
+
+	* lisp/gnus-offline.el (gnus-offline-popup-menu): Bug fix -- Use
+	`gnus-offline-menu-on-agent' if `miee-popup-menu' does not exits.
+
 1999-01-08  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* lisp/pop3.el (pop3-last): Use `split-string' instead of
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 4f5ac84..1888d4d 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -1,5 +1,5 @@
 ;;; gnus-offline.el --- To process mail & news at offline environment.
-;;; $Id: gnus-offline.el,v 1.1.4.2 1999-01-06 22:26:30 yamaoka Exp $
+;;; $Id: gnus-offline.el,v 1.1.4.3 1999-01-10 23:08:53 yamaoka Exp $
 
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;;                    Yukihiro Ito
@@ -848,10 +848,11 @@ If value is nil , dialup line is disconnected status.")
 (defun gnus-offline-popup-menu (event)
   "Popup menu for Gnus offline."
   (interactive "e")
-  (let* ((menu (or
-		(and (boundp 'miee-popup-menu)
-		     (assoc 'keymap (assoc 'Miee (assoc 'menu-bar global-map))))
-		gnus-offline-menu-on-agent))
+  (let* ((menu (if (boundp 'miee-popup-menu)
+		   (or (assoc 'keymap
+			      (assoc 'Miee (assoc 'menu-bar global-map)))
+		       miee-popup-menu)
+		 gnus-offline-menu-on-agent))
 	 (pop (x-popup-menu t menu))
 	 (func (and pop (lookup-key menu (apply 'vector pop)))))
     (and pop func (funcall func))))