From db8c4ebdb2f8a49d6cbf7c16149928a0f12f7d7e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 18 Sep 2002 22:42:24 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 14 +++++++++++++- lisp/gnus-art.el | 13 ++++++------- lisp/gnus-int.el | 2 +- lisp/gnus-msg.el | 2 ++ lisp/imap.el | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99418b5..4ab8102 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,16 @@ +2002-09-18 Juanma Barranquero + + * gnus-int.el (gnus-status-message): Fix spacing. + + * imap.el (imap-continuation): Fix typos. + 2002-09-18 ShengHuo ZHU + * gnus-msg.el (gnus-configure-posting-styles): Sort results. + + * gnus-art.el (gnus-article-reply-with-original): Correct + with-current-buffer scope. + * message.el (message-completion-alist): Add Reply-To, From, etc. 2002-09-18 Simon Josefsson @@ -9709,7 +9720,8 @@ * mml2015.el (mml2015-fix-micalg): Alg might be nil. -2000-12-01 Christopher Splinter +2000-12-01 ShengHuo ZHU + Trivial patch from Christopher Splinter * gnus-sum.el (gnus-summary-limit-to-age): Fix typo. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 6f13913..9950d27 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -47,8 +47,7 @@ (require 'mail-parse) (require 'mm-decode) (require 'mm-view) - (require 'mm-uu) - ) + (require 'mm-uu)) (autoload 'gnus-msg-mail "gnus-msg" nil t) (autoload 'gnus-button-mailto "gnus-msg") @@ -5216,12 +5215,12 @@ the entire article will be yanked." (if (not (mark t)) (with-current-buffer gnus-summary-buffer (gnus-summary-reply (list (list article)) wide)) + (setq cont (buffer-substring (point) (mark t))) + ;; Deactivate active regions. + (when (and (boundp 'transient-mark-mode) + transient-mark-mode) + (setq mark-active nil)) (with-current-buffer gnus-summary-buffer - (setq cont (buffer-substring (point) (mark t))) - ;; Deactivate active regions. - (when (and (boundp 'transient-mark-mode) - transient-mark-mode) - (setq mark-active nil)) (gnus-summary-reply (list (list article cont)) wide))))) diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index fc8fc33..d8c466c 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -263,7 +263,7 @@ If it is down, start it up (again)." (defun gnus-status-message (gnus-command-method) "Return the status message from GNUS-COMMAND-METHOD. -If GNUS-COMMAND-METHOD is a string, it is interpreted as a group name. The method +If GNUS-COMMAND-METHOD is a string, it is interpreted as a group name. The method this group uses will be queried." (let ((gnus-command-method (if (stringp gnus-command-method) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index f30e99a..f0e80ac 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1965,6 +1965,8 @@ this is a reply." (setq results (delq name (delq address results))) ;; make-local-hook is not obsolete in Emacs 20 or XEmacs. (make-local-hook 'message-setup-hook) + (setq results (sort results (lambda (x y) + (string-lessp (car x) (car y))))) (dolist (result results) (add-hook 'message-setup-hook (cond diff --git a/lisp/imap.el b/lisp/imap.el index 4871c08..00204de 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -387,7 +387,7 @@ human readable response text (a string).") (defvar imap-continuation nil "Non-nil indicates that the server emitted a continuation request. -The actually value is really the text on the continuation line.") +The actual value is really the text on the continuation line.") (defvar imap-callbacks nil "List of response tags and callbacks, on the form `(number . function)'. -- 1.7.10.4