diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-17 00:11:27 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-07-17 00:11:27 +0000 |
| commit | 64a465b2d97d00f27ed74513047ced07b798b9fd (patch) | |
| tree | 20035532445dbd0225306e38397eb0448bce2353 | |
| parent | b56414357f0437381231bebf4c38baee9d7e86a8 (diff) | |
| download | emacs-64a465b2d97d00f27ed74513047ced07b798b9fd.tar.gz | |
Merge changes made in Gnus trunk.
message.el (message-auto-save-directory): If the ~/Mail directory doesn't exist, use ~ as the auto-save directory (bug#4432).
gnus-group.el (gnus-group-read-ephemeral-group): Start Gnus if it hasn't already been started.
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9491612a883..32f5b702c6f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2011-07-16 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * message.el (message-auto-save-directory): If the ~/Mail directory + doesn't exist, use ~ as the auto-save directory (bug#4432). + + * gnus-group.el (gnus-group-read-ephemeral-group): Start Gnus if it + hasn't already been started. + 2011-07-15 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus.el (debbugs-gnu): Renamed from debbugs-emacs. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 2ea2a5c9bc7..b4dca3e1fc4 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2282,6 +2282,8 @@ Return the name of the group if selection was successful." (gnus-group-completing-read) (gnus-read-method "From method"))) ;; Transform the select method into a unique server. + (unless (gnus-alive-p) + (gnus-no-server)) (when (stringp method) (setq method (gnus-server-to-method method))) (setq method diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index ffc6a680ef8..ff013e5b291 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1310,7 +1310,9 @@ text and it replaces `self-insert-command' with the other command, e.g. :type '(repeat function)) (defcustom message-auto-save-directory - (file-name-as-directory (expand-file-name "drafts" message-directory)) + (if (file-exists-p message-directory) + (file-name-as-directory (expand-file-name "drafts" message-directory)) + "~/") "*Directory where Message auto-saves buffers if Gnus isn't running. If nil, Message won't auto-save." :group 'message-buffers |