From: yamaoka Date: Sun, 19 Oct 2003 01:32:23 +0000 (+0000) Subject: Synch to Gnus 200310190109. X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c5bf365af315177cf952c135594eae743c088d6;p=elisp%2Fgnus.git- Synch to Gnus 200310190109. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index faf9ead..bcef991 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,66 @@ +2003-10-19 Katsumi Yamaoka + + * gnus-sum.el (gnus-remove-odd-characters): Use + mm-subst-char-in-string instead of subst-char-in-string. + (gnus-summary-refer-article): Use gnus-replace-in-string instead + of replace-regexp-in-string. + +2003-10-19 Jesper Harder + + * gnus-uu.el (gnus-uu-uustrip-article): Really strip directory + from file name. + +2003-10-18 Jesper Harder + + * gnus-sum.el (gnus-summary-save-parts-last-directory): Default + to mm-default-directory. + (gnus-summary-save-parts-1): Use mm-file-name-rewrite-functions. + +2003-10-18 Lars Magne Ingebrigtsen + + * pop3.el (pop3-read-response): Check whether the process is + alive. + + * gnus-sum.el (gnus-summary-refer-article): Strip spaces. + + * rfc2047.el (rfc2047-encode-region): Do error out on invalid + strings. + + * nntp.el (nntp-retrieve-headers-with-xover): Get error messages + right. + + * gnus-agent.el (gnus-agent-read-servers): Remove sit-for. + + * gnus-art.el (article-treat-dumbquotes): Doc fix. + + * message.el (message-field-value): New function. + (message-insert-disposition-notification-to): Use Reply-To, too. + + * imap.el (imap-mailbox-status): Upcase STATUS commands. + + * gnus-sum.el (gnus-remove-odd-characters): New function. + (gnus-nov-parse-line): Use it. + +2003-10-18 Matt Swift + + * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg. + +2003-10-18 Romain FRANCOISE + + * message.el (message-forward-make-body): does both + m-f-make-body-mml and m-f-make-body-plain, resulting in a strange + message buffer. + +2003-10-18 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-narrow-to-page): Only break page if it's + broken. + + * nnrss.el (nnrss-find-rss-via-syndic8): Return nil if xml-rpc + isn't available. + + * message.el (message-hidden-headers): Doc fix. + 2003-10-18 Jesper Harder * gnus-msg.el (gnus-summary-resend-message-edit): Avoid error when diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index f9eb600..0d12140 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -839,8 +839,7 @@ be a select method." (if method (unless (member method gnus-agent-covered-methods) (push method gnus-agent-covered-methods)) - (gnus-message 1 "Ignoring disappeared server `%s'" m) - (sit-for 1)))) + (gnus-message 1 "Ignoring disappeared server `%s'" m)))) (gnus-agent-read-file (nnheader-concat gnus-agent-directory "lib/servers")))) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 55c7b93..0649772 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1913,14 +1913,15 @@ always hide." (forward-line 1)))))) (defun article-treat-dumbquotes () - "Translate M****s*** sm*rtq**t*s into proper text. + "Translate M****s*** sm*rtq**t*s and other symbols into proper text. Note that this function guesses whether a character is a sm*rtq**t* or not, so it should only be used interactively. -Sm*rtq**t*s are M****s***'s unilateral extension to the character map -in an attempt to provide more quoting characters. If you see -something like \\222 or \\264 where you're expecting some kind of -apostrophe or quotation mark, then try this wash." +Sm*rtq**t*s are M****s***'s unilateral extension to the +iso-8859-1 character map in an attempt to provide more quoting +characters. If you see something like \\222 or \\264 where +you're expecting some kind of apostrophe or quotation mark, then +try this wash." (interactive) (article-translate-strings gnus-article-dumbquotes-map)) @@ -5322,21 +5323,22 @@ If given a numerical ARG, move forward ARG pages." (re-search-forward page-delimiter nil 'move arg))) (setq gnus-page-broken t) (goto-char (match-end 0))) - (narrow-to-region - (point) - (if (re-search-forward page-delimiter nil 'move) - (match-beginning 0) - (point))) - (when (and (gnus-visual-p 'page-marker) - (not (= (point-min) 1))) - (save-excursion - (goto-char (point-min)) - (gnus-insert-prev-page-button))) - (when (and (gnus-visual-p 'page-marker) - (< (+ (point-max) 2) (buffer-size))) - (save-excursion - (goto-char (point-max)) - (gnus-insert-next-page-button))))) + (when gnus-page-broken + (narrow-to-region + (point) + (if (re-search-forward page-delimiter nil 'move) + (match-beginning 0) + (point))) + (when (and (gnus-visual-p 'page-marker) + (not (= (point-min) 1))) + (save-excursion + (goto-char (point-min)) + (gnus-insert-prev-page-button))) + (when (and (gnus-visual-p 'page-marker) + (< (+ (point-max) 2) (buffer-size))) + (save-excursion + (goto-char (point-max)) + (gnus-insert-next-page-button)))))) ;; Article mode commands diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 67cffad..3a4aab6 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -3983,6 +3983,13 @@ Returns HEADER if it was entered in the DEPENDENCIES. Returns nil otherwise." (setq heads nil))))) gnus-newsgroup-dependencies))) +(defsubst gnus-remove-odd-characters (string) + "Translate STRING into something that doesn't contain weird characters." + (mm-subst-char-in-string + ?\r ?\- + (mm-subst-char-in-string + ?\n ?\- string))) + ;; This function has to be called with point after the article number ;; on the beginning of the line. (defsubst gnus-nov-parse-line (number dependencies &optional force-new) @@ -8106,6 +8113,7 @@ of what's specified by the `gnus-refer-thread-limit' variable." (interactive "sMessage-ID: ") (when (and (stringp message-id) (not (zerop (length message-id)))) + (setq message-id (gnus-replace-in-string message-id " " "")) ;; Construct the correct Message-ID if necessary. ;; Suggested by tale@pawl.rpi.edu. (unless (string-match "^<" message-id) @@ -11062,13 +11070,15 @@ If REVERSE, save parts that do not match TYPE." (not (string-match type (mm-handle-media-type handle))) (string-match type (mm-handle-media-type handle))) (let ((file (expand-file-name - (file-name-nondirectory - (or - (mail-content-type-get - (mm-handle-disposition handle) 'filename) - (concat gnus-newsgroup-name - "." (number-to-string - (cdr gnus-article-current))))) + (gnus-map-function + mm-file-name-rewrite-functions + (file-name-nondirectory + (or + (mail-content-type-get + (mm-handle-disposition handle) 'filename) + (concat gnus-newsgroup-name + "." (number-to-string + (cdr gnus-article-current)))))) dir))) (unless (file-exists-p file) (mm-save-part-to-file handle file)))))) diff --git a/lisp/imap.el b/lisp/imap.el index 7b8316b..3da8024 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -1329,10 +1329,11 @@ returned, if ITEMS is a symbol only its value is returned." (imap-send-command-wait (list "STATUS \"" (imap-utf7-encode mailbox) "\" " - (format "%s" - (if (listp items) - items - (list items)))))) + (upcase + (format "%s" + (if (listp items) + items + (list items))))))) (if (listp items) (mapcar (lambda (item) (imap-mailbox-get item mailbox)) diff --git a/lisp/message.el b/lisp/message.el index 018deee..f9a41dd 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1218,7 +1218,7 @@ candidates: (defcustom message-hidden-headers nil "Regexp of headers to be hidden when composing new messages. This can also be a list of regexps to match headers. Or a list -starting with `not' and followed by regexps.." +starting with `not' and followed by regexps." :group 'message :type '(repeat regexp)) @@ -1798,6 +1798,13 @@ see `message-narrow-to-headers-or-head'." (set-text-properties 0 (length value) nil value) value))) +(defun message-field-value (header &optional not-all) + "The same as `message-fetch-field', only narrow to the headers first." + (save-excursion + (save-restriction + (message-narrow-to-headers-or-head) + (message-fetch-field header not-all)))) + (defun message-narrow-to-field () "Narrow the buffer to the header on the current line." (beginning-of-line) @@ -3124,10 +3131,8 @@ Note that this should not be used in newsgroups." (message-remove-header "Disposition-Notification-To")) (message-goto-eoh) (insert (format "Disposition-Notification-To: %s\n" - (or (save-excursion - (save-restriction - (message-narrow-to-headers) - (message-fetch-field "From"))) + (or (message-field-value "Reply-to") + (message-field-value "From") (message-make-from)))))) (defun message-elide-region (b e) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index ef05220..0261dea 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -155,7 +155,7 @@ set this variable to nil if you consider all urls to be safe." :group 'mime-display) (defcustom mm-inline-media-tests - '(("image/jpeg" + '(("image/p?jpeg" mm-inline-image (lambda (handle) (mm-valid-and-fit-image-p 'jpeg handle))) @@ -241,7 +241,7 @@ set this variable to nil if you consider all urls to be safe." ;; Default to displaying as text (".*" mm-inline-text mm-readable-p)) "Alist of media types/tests saying whether types can be displayed inline." - :type '(repeat (list (string :tag "MIME type") + :type '(repeat (list (regexp :tag "MIME type") (function :tag "Display function") (function :tag "Display test"))) :group 'mime-display) diff --git a/lisp/nnrss.el b/lisp/nnrss.el index d723f3e..6a6c4f0 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -689,7 +689,9 @@ whether they are `offsite' or `onsite'." (defun nnrss-find-rss-via-syndic8 (url) "query syndic8 for the rss feeds it has for the url." (if (not (locate-library "xml-rpc")) - (message "XML-RPC is not available... not checking Syndic8.") + (progn + (message "XML-RPC is not available... not checking Syndic8.") + nil) (require 'xml-rpc) (let ((feedid (xml-rpc-method-call "http://www.syndic8.com/xmlrpc.php" diff --git a/lisp/nntp.el b/lisp/nntp.el index 07c3a0f..784d7c0 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -475,8 +475,7 @@ be restored and the command retried." (goto-char pos) (if (looking-at (regexp-quote command)) (delete-region pos (progn (forward-line 1) - (gnus-point-at-bol)))) - ))) + (gnus-point-at-bol))))))) (nnheader-report 'nntp "Couldn't open connection to %s." nntp-address)))) @@ -1491,8 +1490,7 @@ password contained in '~/.nntp-authinfo'." in-process-buffer-p (buf nntp-server-buffer) (process-buffer (nntp-find-connection-buffer nntp-server-buffer)) - first - last) + first last status) ;; We have to check `nntp-server-xover'. If it gets set to nil, ;; that means that the server does not understand XOVER, but we ;; won't know that until we try. @@ -1526,15 +1524,22 @@ password contained in '~/.nntp-authinfo'." (while (progn (goto-char (or last-point (point-min))) ;; Count replies. - (while (re-search-forward "^[0-9][0-9][0-9] .*\n" nil t) - (incf received)) + (while (re-search-forward "^\\([0-9][0-9][0-9]\\) .*\n" + nil t) + (incf received) + (setq status (match-string 1)) + (if (string-match "^[45]" status) + (setq status 'error) + (setq status 'ok))) (setq last-point (point)) (or (< received count) - ;; I haven't started reading the final response - (progn - (goto-char (point-max)) - (forward-line -1) - (not (looking-at "^\\.\r?\n"))))) + (if (eq status 'error) + nil + ;; I haven't started reading the final response + (progn + (goto-char (point-max)) + (forward-line -1) + (not (looking-at "^\\.\r?\n")))))) ;; I haven't read the end of the final response (nntp-accept-response) (set-buffer process-buffer)))) diff --git a/lisp/pop3.el b/lisp/pop3.el index 3bb1de5..4ac4a75 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -293,7 +293,8 @@ Return the response string if optional second argument RETURN is non-nil." (save-excursion (set-buffer (process-buffer process)) (goto-char pop3-read-point) - (while (not (search-forward "\r\n" nil t)) + (while (and (memq (process-status process) '(open run)) + (not (search-forward "\r\n" nil t))) (nnheader-accept-process-output process) (goto-char pop3-read-point)) (setq match-end (point)) diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 1160022..3453f7b 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -378,8 +378,8 @@ Dynamically bind `rfc2047-encoding-type' to change that." (rfc2047-encode start end) (setq last-encoded t))))) (error - (message "Invalid data for rfc2047 encoding: %s" - (buffer-substring b e))))))) + (error "Invalid data for rfc2047 encoding: %s" + (buffer-substring b e))))))) (rfc2047-fold-region b (point)))) (defun rfc2047-encode-string (string) diff --git a/texi/ChangeLog b/texi/ChangeLog index 370c883..a9b65a7 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2003-10-12 Adrian Aichner + + * gnus.texi (Mail Source Specifiers): uref fixes. + 2003-10-18 Jesper Harder * gnus.texi (Group Mail Splitting) diff --git a/texi/Makefile.in b/texi/Makefile.in index a45ab99..430c1b9 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -173,8 +173,8 @@ gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi: $(src egrep -v "end\{document\}" $< > gnus.tmplatexi cat $(srcdir)/postamble.tex >> gnus.tmplatexi TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi - thumbpdf gnus.pdf - TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi + #thumbpdf gnus.pdf + #TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi mv gnus.pdf $@ latexps: gnus.dvi-x diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 3bfc53d..98d7ff1 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -12833,9 +12833,9 @@ UNDELETED} はおそらくたいていの人には最良の選択でしょうが、ときど @end lisp @item webmail -@uref{www.hotmail.com}, @uref{webmail.netscape.com}, -@uref{www.netaddress.com}, @uref{www.yahoo.com} などのウェブメールサーバー -からメールを取得します。 +@uref{http://www.hotmail.com/}, @uref{http://webmail.netscape.com/}, +@uref{http://www.netaddress.com/}, @uref{http://www.yahoo.com/} などのウェ +ブメールサーバーからメールを取得します。 注: ウェブメールはクッキーに大きく依存します。url "4.0pre.46" を使う場合 は "one-line-cookie" パッチを当てる必要があります。 diff --git a/texi/gnus.texi b/texi/gnus.texi index cfce69f..0d167fb 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -13575,11 +13575,11 @@ An example @acronym{IMAP} mail source: @end lisp @item webmail -Get mail from a webmail server, such as @uref{www.hotmail.com}, -@uref{webmail.netscape.com}, @uref{www.netaddress.com}, -@uref{mail.yahoo.com}. +Get mail from a webmail server, such as @uref{http://www.hotmail.com/}, +@uref{http://webmail.netscape.com/}, @uref{http://www.netaddress.com/}, +@uref{http://mail.yahoo.com/}. -NOTE: Webmail largely depends cookies. A "one-line-cookie" patch is +NOTE: Webmail largely depends on cookies. A "one-line-cookie" patch is required for url "4.0pre.46". WARNING: Mails may be lost. NO WARRANTY.