Synch to No Gnus 200507290604.

[elisp/gnus.git-] / lisp / gnus-offline.el

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 79eaa10..6cd037c 100644 (file)
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -27,10 +27,10 @@
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 ;;; GNU General Public License for more details.
 
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 ;;;
 ;;;; Commentary:
 ;;; Note.
@@ -798,10 +798,10 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   "*Set interval time for gnus-daemon."
   (interactive)
   (setq gnus-offline-interval-time
-       (string-to-int (read-from-minibuffer
-                       (format (gnus-offline-gettext 'interval-time-1)
-                               gnus-offline-interval-time)
-                       nil)))
+       (string-to-number (read-from-minibuffer
+                          (format (gnus-offline-gettext 'interval-time-1)
+                                  gnus-offline-interval-time)
+                          nil)))
   (if (< gnus-offline-interval-time 2)
       (progn
        (message "%s" (gnus-offline-gettext 'interval-time-2))
@@ -846,35 +846,13 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
    ((featurep 'xemacs)
     (popup-menu menu))
    (t
-    (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.
-                   (or (keymapp menu)
-                       (setq menu
-                             (append (list ""  ;; This will be ignored.
-                                           (or title "Popup Menu")
-                                           "-----"
-                                           "-----")
-                                     (cdr menu))))
-                   (setq keymap
-                         (if (keymapp menu)
-                             (append (list 'keymap
-                                           (if title
-                                               `(nil ,title)
-                                             '(nil "Popup Menu"))
-                                           '(nil "")
-                                           '(nil ""))
-                                     (cdr menu))
-                           (funcall menu-func (car menu) (cdr menu)))))
-                  (t
-                   (setq keymap
-                         (if (keymapp menu)
-                             menu
-                           (funcall menu-func (car menu) (cdr menu))))))
+    (let* ((menu-func (or (and (fboundp 'easy-menu-create-menu)
+                              'easy-menu-create-menu)
+                         'easy-menu-create-keymaps))
+          (keymap (if (keymapp menu)
+                      menu
+                    (funcall menu-func (car menu) (cdr menu))))
+          pop func)
       ;; Display the popup menu.
       (if (and (setq pop (x-popup-menu t keymap))
               (setq func (lookup-key keymap