Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c798492..4e53b76 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-26  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-view.el (mm-w3m-mode-ignored-keys): New variable.
+       (mm-setup-w3m): Use it.
+
 2002-09-27  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-article-mode-syntax-table): Make M-. work in

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 68aa8b3..046142a 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -230,6 +230,9 @@ will not be substituted.")
 (defvar mm-w3m-mode-dont-bind-keys (list [up] [right] [left] [down])
   "List of keys which should not be bound for the emacs-w3m commands.")
 
+(defvar mm-w3m-mode-ignored-keys (list [down-mouse-2])
+  "List of keys which should ignore.")
+
 (defvar mm-w3m-setup nil
   "Whether gnus-article-mode has been setup to use emacs-w3m.")
 
@@ -246,6 +249,10 @@ will not be substituted.")
       (dolist (key mm-w3m-mode-dont-bind-keys)
        (condition-case nil
            (define-key mm-w3m-mode-map key nil)
+         (error)))
+      (dolist (key mm-w3m-mode-ignored-keys)
+       (condition-case nil
+           (define-key mm-w3m-mode-map key 'ignore)
          (error))))
     (unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist)
       (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index bc30a59..9ee388b 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -878,8 +878,8 @@ function is generally only called when Gnus is shutting down."
   "Update the unseen count in `nnimap-mailbox-info'."
   (gnus-sethash
    (gnus-group-prefixed-name group server)
-   (let ((old (gnus-gethash (gnus-group-prefixed-name group server) 
-                           nnimap-mailbox-info)))
+   (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server) 
+                                nnimap-mailbox-info)))
      (list (nth 0 old) (nth 1 old)
           (imap-mailbox-status group 'unseen nnimap-server-buffer)
           (nth 3 old)))