From: Miles Bader Date: Fri, 15 Jun 2007 04:03:46 +0000 (+0000) Subject: Merge from gnus--rel--5.10 X-Git-Tag: emacs-pretest-22.1.90~1346 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cedca8d0e8e48e6c1db95aac6571a56e653ce02;p=emacs.git Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 230-231) - ChangeLog tweak - Update from CVS 2007-06-14 Katsumi Yamaoka * lisp/gnus/gnus-agent.el (gnus-agent-fetch-headers) (gnus-agent-retrieve-headers): Bind gnus-decode-encoded-address-function to identity. * lisp/gnus/nntp.el (nntp-send-xover-command): Recognize an xover command is available also when the server returns simply a dot. * lisp/gnus/gnus-ems.el (gnus-x-splash): Redisplay window before measuring it. Revision: emacs@sv.gnu.org/emacs--rel--22--patch-48 --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 17ef7f996b3..0e9da63da1a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,14 @@ +2007-06-14 Katsumi Yamaoka + + * gnus-agent.el (gnus-agent-fetch-headers) + (gnus-agent-retrieve-headers): Bind + gnus-decode-encoded-address-function to identity. + + * nntp.el (nntp-send-xover-command): Recognize an xover command is + available also when the server returns simply a dot. + + * gnus-ems.el (gnus-x-splash): Redisplay window before measuring it. + 2007-06-08 Katsumi Yamaoka * gnus-ems.el (gnus-x-splash): Make it work. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 4dac2ac55ea..26c3a1d90c3 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -6370,8 +6370,7 @@ * message.el (message-required-headers): Add From. -2003-01-02 Katsumi Yamaoka - Trivial patch from Norbert Koch . +2003-01-02 Norbert Koch (tiny change) * gnus-msg.el (gnus-gcc-externalize-attachments): Fix typo. @@ -6984,8 +6983,7 @@ * nnmaildir.el (nnmaildir-request-group): bugfix: don't erase nntp-server-buffer if we aren't going to write to it. -2002-12-04 Katsumi Yamaoka - Trivial patch from Itai Zukerman . +2002-12-04 Itai Zukerman (tiny change) * mm-decode.el (mm-w3m-safe-url-regexp): Fix parenthesis. @@ -7233,8 +7231,7 @@ * nnimap.el (nnimap-request-expire-articles): Compress sequence before storing \Deleted mark on expired articles. -2002-11-17 Shenghuo Zhu - Trivial patch from Markus Rost +2002-11-17 Markus Rost (tiny change) * gnus-sum.el (gnus-summary-goto-unread): Doc fix - escape open parens in column 0. @@ -7906,10 +7903,12 @@ (mml1991-pgg-sign, mml1991-pgg-encrypt): New functions. (mml1991-pgg-encrypt): Fix recipients querying. +2002-09-28 + + * mml2015.el (autoload): Autoload correct files. + 2002-09-28 Simon Josefsson - * mml2015.el (autoload): Autoload correct files. Trivial patch - from dme@dme.org. (mml2015-pgg-decrypt, mml2015-pgg-verify): Make sure either nil or handle is returned. @@ -8486,12 +8485,10 @@ * imap.el (imap-shell-open): Allow non-list `imap-shell-program'. (imap-shell-open): Skip initial junk before IMAP greeting. -2002-08-11 Simon Josefsson +2002-08-11 Reiner Steib - * message-utils.el (message-xpost-default, - message-xpost-fup2-header, message-xpost-fup2): Fixed - Typos. Trivial changes from Reiner Steib - <4uce.02.r.steib@gmx.net>. + * message-utils.el (message-xpost-default) + (message-xpost-fup2-header, message-xpost-fup2): Fixed Typos. 2002-08-09 Simon Josefsson @@ -9915,10 +9912,9 @@ (mm-inline-wash-with-file): New function. (mm-inline-wash-with-stdin): New function. -2002-02-17 ShengHuo ZHU +2002-02-17 Reiner Steib * message-utils.el: Fix installation doc. - From: Reiner Steib <4uce.02.r.steib@gmx.net> 2002-02-16 ShengHuo ZHU diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index f54b568a7ef..7a18c42d7cd 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1768,6 +1768,7 @@ article numbers will be returned." (gnus-uncompress-range (gnus-active group)) (gnus-list-of-unread-articles group))) (gnus-decode-encoded-word-function 'identity) + (gnus-decode-encoded-address-function 'identity) (file (gnus-agent-article-name ".overview" group))) (unless fetch-all @@ -3571,6 +3572,7 @@ has been fetched." (save-excursion (gnus-agent-create-buffer) (let ((gnus-decode-encoded-word-function 'identity) + (gnus-decode-encoded-address-function 'identity) (file (gnus-agent-article-name ".overview" group)) cached-articles uncached-articles) (gnus-make-directory (nnheader-translate-file-chars diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index 4400b81f041..9b2ddc3ee88 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/gnus-ems.el @@ -183,6 +183,7 @@ (file (nnheader-find-etc-directory "images/gnus/x-splash" t)) pixmap fcw fch width height fringes sbars left yoffset top ls) (erase-buffer) + (sit-for 0) ;; Necessary for measuring the window size correctly. (when (and file (ignore-errors (let ((coding-system-for-read 'raw-text) diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 25b924a93e7..2b62cd7fffa 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1580,7 +1580,8 @@ password contained in '~/.nntp-authinfo'." ;; article number. How... helpful. (progn (forward-line 1) - (looking-at "[0-9]+\t...")) ; More text after number. + ;; More text after number, or a dot. + (looking-at "[0-9]+\t...\\|\\.\r?\n")) (setq nntp-server-xover (car commands)))) (setq commands (cdr commands))) ;; If none of the commands worked, we disable XOVER.