[Emacs-diffs] /srv/bzr/emacs/trunk r107216: gnus-msg.el (gnus-msg-mail): Use `message-mail' if Gnus isn't running.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107216
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-09 23:07:49 +0000
message:
  gnus-msg.el (gnus-msg-mail): Use `message-mail' if Gnus isn't running.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-msg.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-09 06:05:43 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-09 23:07:49 +0000
@@ -1,5 +1,8 @@
 2012-02-09  Lars Ingebrigtsen  <address@hidden>
 
+       * gnus-msg.el (gnus-msg-mail): Use `message-mail' if Gnus isn't
+       running.
+
        * nnimap.el (nnimap-wait-for-response): Minor fixup of message string.
 
        * gnus.el (gnus-server-extend-method): Don't add an -address component

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2012-02-02 10:38:16 +0000
+++ b/lisp/gnus/gnus-msg.el     2012-02-09 23:07:49 +0000
@@ -478,22 +478,26 @@
 
 ;;;###autoload
 (defun gnus-msg-mail (&optional to subject other-headers continue
-                     switch-action yank-action send-actions return-action)
+                               switch-action yank-action send-actions 
return-action)
   "Start editing a mail message to be sent.
 Like `message-mail', but with Gnus paraphernalia, particularly the
-Gcc: header for archiving purposes."
+Gcc: header for archiving purposes.
+If Gnus isn't running, a plain `message-mail' setup is used
+instead."
   (interactive)
-  (let ((buf (current-buffer))
-       mail-buf)
-    (gnus-setup-message 'message
-      (message-mail to subject other-headers continue
-                   nil yank-action send-actions return-action))
-    (when switch-action
-      (setq mail-buf (current-buffer))
-      (switch-to-buffer buf)
-      (apply switch-action mail-buf nil)))
-  ;; COMPOSEFUNC should return t if succeed.  Undocumented ???
-  t)
+  (if (not (gnus-alive-p))
+      (message-mail)
+    (let ((buf (current-buffer))
+         mail-buf)
+      (gnus-setup-message 'message
+       (message-mail to subject other-headers continue
+                     nil yank-action send-actions return-action))
+      (when switch-action
+       (setq mail-buf (current-buffer))
+       (switch-to-buffer buf)
+       (apply switch-action mail-buf nil))
+      ;; COMPOSEFUNC should return t if succeed.  Undocumented ???
+      t)))
 
 ;;;###autoload
 (defun gnus-button-mailto (address)