Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-250

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 597, 602, 604, 607, 615, 617, 619-621)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 149)

   - Merge from emacs--cvs-trunk--0

2005-10-23  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus-sum.el (gnus-ignored-from-addresses): Handle case where
   user-mail-name is an empty string.

2005-10-17  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus-cus.el (gnus-custom-map): New variable. Bind mouse-1 to
   widget-move-and-invoke.
   (gnus-custom-mode): Use gnus-custom-map.

2005-10-15  Bill Wohler  <wohler@newt.com>

   * lisp/message.el (message-tool-bar-map): Renamed image file from
   mail_send to mail/send.

2005-10-16  Masatake YAMATO  <jet@gyve.org>

   * lisp/message.el (message-expand-group): Pass the common
   prefix substring of completion to `display-completion-list'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acec605..13ed8a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-23  Chong Yidong  <cyd@stupidchicken.com>
+
+       * gnus-sum.el (gnus-ignored-from-addresses): Handle case where
+       user-mail-name is an empty string.
+
 2005-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
@@ -74,6 +79,22 @@
 
        * lpath.el: Fbind codepage-setup for XEmacs.
 
+2005-10-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * gnus-cus.el (gnus-custom-map): New variable.  Bind mouse-1 to
+       widget-move-and-invoke.
+       (gnus-custom-mode): Use gnus-custom-map.
+
+2005-10-15  Bill Wohler  <wohler@newt.com>
+
+       * message.el (message-tool-bar-map): Renamed image file from
+       mail_send to mail/send.
+
+2005-10-16  Masatake YAMATO  <jet@gyve.org>
+
+       * message.el (message-expand-group): Pass the common
+       prefix substring of completion to `display-completion-list'.
+
 2005-10-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mml-sec.el (mml-secure-method): New internal variable.

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 8660096..a2db8c7 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -36,6 +36,14 @@
 
 ;;; Widgets:
 
+(defvar gnus-custom-map
+  (let ((map (make-keymap)))
+    (set-keymap-parent map widget-keymap)
+    (suppress-keymap map)
+    (define-key map [mouse-1] 'widget-move-and-invoke)
+    map)
+  "Keymap for editing Gnus customization buffers.")
+
 (defun gnus-custom-mode ()
   "Major mode for editing Gnus customization buffers.
 
@@ -51,7 +59,7 @@ if that value is non-nil."
   (kill-all-local-variables)
   (setq major-mode 'gnus-custom-mode
        mode-name "Gnus Customize")
-  (use-local-map widget-keymap)
+  (use-local-map gnus-custom-map)
   ;; Emacs 21 stuff:
   (when (and (facep 'custom-button-face)
             (facep 'custom-button-pressed-face))
@@ -479,7 +487,7 @@ form, but who cares?"
            (widget-create 'sexp
                           :tag "Method"
                           :value (gnus-info-method info))))
-    (use-local-map widget-keymap)
+    (use-local-map gnus-custom-map)
     (widget-setup)
     (buffer-enable-undo)
     (goto-char (point-min))))
@@ -873,7 +881,7 @@ articles in the thread.
                         '(repeat :inline t
                                  :tag "Unknown entries"
                                  sexp)))
-    (use-local-map widget-keymap)
+    (use-local-map gnus-custom-map)
     (widget-setup)))
 
 (defun gnus-score-customize-done (&rest ignore)
@@ -1050,7 +1058,7 @@ articles in the thread.
 
       (gnus-agent-cat-prepare-category-field agent-enable-undownloaded-faces)
 
-      (use-local-map widget-keymap)
+      (use-local-map gnus-custom-map)
       (widget-setup)
       (buffer-enable-undo))))
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f7bd491..50f3253 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1056,7 +1056,9 @@ which it may alter in any way."
   :type '(repeat symbol))
 
 (defcustom gnus-ignored-from-addresses
-  (and user-mail-address (regexp-quote user-mail-address))
+  (and user-mail-address  
+       (not (string= user-mail-address ""))
+       (regexp-quote user-mail-address))
   "*Regexp of From headers that may be suppressed in favor of To headers."
   :version "21.1"
   :group 'gnus-summary

diff --git a/lisp/message.el b/lisp/message.el
index 4f93901..04e5d60 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6704,7 +6704,7 @@ which specify the range to operate on."
                                           write-file dired open-file))
                 (define-key tool-bar-map (vector key) nil))
               (message-tool-bar-local-item-from-menu
-               'message-send-and-exit "mail_send" tool-bar-map message-mode-map)
+               'message-send-and-exit "mail/send" tool-bar-map message-mode-map)
               (message-tool-bar-local-item-from-menu
                'message-kill-buffer "close" tool-bar-map message-mode-map)
               (message-tool-bar-local-item-from-menu
@@ -6816,7 +6816,7 @@ those headers."
          (let ((buffer-read-only nil))
            (erase-buffer)
            (let ((standard-output (current-buffer)))
-             (display-completion-list (sort completions 'string<)))
+             (display-completion-list (sort completions 'string<) string))
            (goto-char (point-min))
            (delete-region (point) (progn (forward-line 3) (point))))))))))