2001-05-05 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el (message-do-send-housekeeping): mail-abbrevs may
	rename buffer behind Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6e8480..7ea0ed8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-05 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-do-send-housekeeping): mail-abbrevs may
+       rename buffer behind Gnus.
+
 2001-05-04 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnrss.el (nnrss-check-group): Use nnheader-translate-file-chars.

diff --git a/lisp/message.el b/lisp/message.el
index 47a7af7..131389e 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3747,11 +3747,14 @@ than 988 characters long, and if they are not, trim them until they are."
   ;; Rename the buffer.
   (if message-send-rename-function
       (funcall message-send-rename-function)
-    (when (string-match "\\`\\*\\(sent \\|unsent \\)?\\(.+\\)\\*[^\\*]*" 
-                       (buffer-name))
+    ;; Note: mail-abbrevs of XEmacs renames buffer name behind Gnus.
+    (when (string-match 
+          "\\`\\*\\(sent \\|unsent \\)?\\(.+\\)\\*[^\\*]*\\|\\`mail to " 
+          (buffer-name))
       (let ((name (match-string 2 (buffer-name)))
            to group)
-       (if (not (or (string-equal name "mail")
+       (if (not (or (null name)
+                    (string-equal name "mail")
                     (string-equal name "news")))
            (setq name (concat "*sent " name "*"))
          (setq to (message-fetch-field "to"))