From 2eeb2d6f88ad5353116ec1e7c3a1982d19f2fb7d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 11 Jan 2001 02:00:14 +0000 Subject: [PATCH] Synch with Oort Gnus. --- ChangeLog | 4 ++ lisp/ChangeLog | 39 ++++++++++- lisp/dgnushack.el | 7 -- lisp/gnus-util.el | 6 +- lisp/gnus.el | 9 --- lisp/message.el | 191 +++++++++++++++++++++++++++-------------------------- lisp/mm-decode.el | 10 ++- lisp/mm-encode.el | 5 +- lisp/mm-util.el | 2 + lisp/mml.el | 18 +++-- lisp/nnvirtual.el | 2 +- texi/ChangeLog | 4 ++ texi/gnus-ja.texi | 2 +- texi/gnus.texi | 2 +- 14 files changed, 179 insertions(+), 122 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba55810..7696c52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-01-11 Katsumi Yamaoka + + * lisp/dgnushack.el (dgnushack-texi-format): Cancel last change. + 2001-01-10 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 03. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5741f9f..9831cdd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,40 @@ +2001-01-10 14:00:00 ShengHuo ZHU + + * gnus.el: Sync with EMACS_PRETEST_21_0_95. + * gnus.el (gnus-default-posting-charset): Bogus. Removed. + +2001-01-08 Dave Love + + * mm-encode.el (mm-qp-or-base64): Don't base64 for the sake of a + single character. + + * mm-util.el (mm-mime-mule-charset-alist): Add Latin-{8,9}. + + * message.el: Doc and message fixes. + (message-send-rename-function) + (message-make-forward-subject-function) + (message-send-mail-function, message-reply-to-function) + (message-wide-reply-to-function, message-followup-to-function) + (message-distribution-function, message-auto-save-directory): Fix + :type. + + * gnus/mml.el (mml-parse-1): Frob mml-confirmation-set when + proceeding after warnings. Amend multipart warning message. + +2001-01-04 Dave Love + + * gnus-util.el (nnmail-pathname-coding-system): Defvar when + compiling. + (gnus-make-directory): Require nnmail. + + * mm-decode.el (mm-inline-media-tests): Add + image/x-portable-bitmap. + (mm-get-image): Grok pbm. + +2001-01-10 Paul Stevenson + + * nnvirtual.el (nnvirtual-request-expire-articles): delq nil. + 2001-01-09 Didier Verna * dgnushack.el (dgnushack-compile): give a dummy value to @@ -28,7 +65,7 @@ 2001-01-08 23:00:00 ShengHuo ZHU * nnmail.el (nnmail-get-new-mail): Find group only if file is not - orig-file. Use ,source. + orig-file. Use ',source. 2001-01-08 22:00:00 ShengHuo ZHU diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index b0e050c..17121ea 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -400,13 +400,6 @@ Modify to suit your needs.")) (1+ (match-end 0)) (point-max)))) (goto-char (point-min)) - ;; Remove "@anchor" if it is not supported. - (unless (fboundp 'texinfo-anchor) - (while (re-search-forward "^@anchor" nil t) - (delete-region (match-beginning 0) (progn - (forward-line 1) - (point)))) - (goto-char (point-min))) ;; Add suffix if it is needed. (when (and addsuffix (re-search-forward diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 38c253e..4baa25c 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -32,7 +32,10 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + ;; Fixme: this should be a gnus variable, not nnmail-. + (defvar nnmail-pathname-coding-system)) (eval-when-compile (require 'static)) (require 'custom) @@ -557,6 +560,7 @@ Bind `print-quoted' and `print-readably' to t while printing." (defun gnus-make-directory (directory) "Make DIRECTORY (and all its parents) if it doesn't exist." + (require 'nnmail) (let ((file-name-coding-system nnmail-pathname-coding-system) (pathname-coding-system nnmail-pathname-coding-system)) (when (and directory diff --git a/lisp/gnus.el b/lisp/gnus.el index 07818b6..850a316 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1636,15 +1636,6 @@ covered by that variable." :type 'symbol :group 'gnus-charset) -(defcustom gnus-default-posting-charset nil - "Default charset assumed to be used when posting non-ASCII characters. -This variable is overridden on a group-to-group basis by the -gnus-group-posting-charset-alist variable and is only used on groups not -covered by that variable. -If nil, no default charset is assumed when posting." - :type 'symbol - :group 'gnus-charset) - ;;; Internal variables diff --git a/lisp/message.el b/lisp/message.el index 21de9a8..e8048a6 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -128,7 +128,7 @@ (defcustom message-send-rename-function nil "Function called to rename the buffer after sending it." :group 'message-buffers - :type 'function) + :type '(choice function (const nil))) (defcustom message-fcc-handler-function 'message-output "*A function called to save outgoing articles. @@ -172,7 +172,7 @@ If this variable is nil, no such courtesy message will be added." (defcustom message-from-style 'default "*Specifies how \"From\" headers look. -If `nil', they contain just the return address like: +If nil, they contain just the return address like: king@grassland.com If `parens', they look like: king@grassland.com (Elvis Parsley) @@ -195,13 +195,14 @@ To disable checking of long signatures, for instance, add Don't touch this variable unless you really know what you're doing. -Checks include subject-cmsg multiple-headers sendsys message-id from -long-lines control-chars size new-text quoting-style -redirected-followup signature approved sender empty empty-headers -message-id from subject shorten-followup-to existing-newsgroups -buffer-file-name unchanged newsgroups." +Checks include `subject-cmsg', `multiple-headers', `sendsys', +`message-id', `from', `long-lines', `control-chars', `size', +`new-text', `quoting-style', `redirected-followup', `signature', +`approved', `sender', `empty', `empty-headers', `message-id', `from', +`subject', `shorten-followup-to', `existing-newsgroups', +`buffer-file-name', `unchanged', `newsgroups'." :group 'message-news - :type '(repeat sexp)) + :type '(repeat sexp)) ; Fixme: improve this (defcustom message-required-news-headers '(From Newsgroups Subject Date Message-ID @@ -323,7 +324,7 @@ nil means let mailer mail back a message to report errors." :type 'boolean) (defcustom message-generate-new-buffers 'unique - "*Non-nil means that a new message buffer will be created whenever `message-setup' is called. + "*Non-nil means create a new message buffer whenever `message-setup' is called. If this is a function, call that function with three parameters: The type, the to address and the group name. (Any of these may be nil.) The function should return the new buffer name." @@ -387,19 +388,20 @@ If t, use `message-user-organization-file'." (defcustom message-make-forward-subject-function 'message-forward-subject-author-subject - "*A list of functions that are called to generate a subject header for forwarded messages. + "*List of functions called to generate subject headers for forwarded messages. The subject generated by the previous function is passed into each successive function. The provided functions are: -* message-forward-subject-author-subject (Source of article (author or +* `message-forward-subject-author-subject' (Source of article (author or newsgroup)), in brackets followed by the subject -* message-forward-subject-fwd (Subject of article with 'Fwd:' prepended +* `message-forward-subject-fwd' (Subject of article with 'Fwd:' prepended to it." :group 'message-forwarding :type '(radio (function-item message-forward-subject-author-subject) - (function-item message-forward-subject-fwd))) + (function-item message-forward-subject-fwd) + (repeat :tag "List of functions" function))) (defcustom message-forward-as-mime t "*If non-nil, forward messages as an inline/rfc822 MIME section. Otherwise, directly inline the old message in the forwarded message." @@ -460,12 +462,16 @@ The headers should be delimited by a line whose contents match the variable `mail-header-separator'. Valid values include `message-send-mail-with-sendmail' (the default), -`message-send-mail-with-mh', `message-send-mail-with-qmail' and -`message-send-mail-with-smtp'." +`message-send-mail-with-mh', `message-send-mail-with-qmail', +`message-send-mail-with-smtp', `smtpmail-send-it' and `feedmail-send-it'. + +See also `send-mail-function'." :type '(radio (function-item message-send-mail-with-sendmail) (function-item message-send-mail-with-mh) (function-item message-send-mail-with-qmail) (function-item message-send-mail-with-smtp) + (function-item smtpmail-send-it) + (function-item feedmail-send-it) (function :tag "Other")) :group 'message-sending :group 'message-mail) @@ -480,25 +486,25 @@ variable `mail-header-separator'." :type 'function) (defcustom message-reply-to-function nil - "Function that should return a list of headers. + "If non-nil, function that should return a list of headers. This function should pick out addresses from the To, Cc, and From headers and respond with new To and Cc headers." :group 'message-interface - :type 'function) + :type '(choice function (const nil))) (defcustom message-wide-reply-to-function nil - "Function that should return a list of headers. + "If non-nil, function that should return a list of headers. This function should pick out addresses from the To, Cc, and From headers and respond with new To and Cc headers." :group 'message-interface - :type 'function) + :type '(choice function (const nil))) (defcustom message-followup-to-function nil - "Function that should return a list of headers. + "If non-nil, function that should return a list of headers. This function should pick out addresses from the To, Cc, and From headers and respond with new To and Cc headers." :group 'message-interface - :type 'function) + :type '(choice function (const nil))) (defcustom message-use-followup-to 'ask "*Specifies what to do with Followup-To header. @@ -549,7 +555,7 @@ is never used." (const :tag "ask" ask))) (defcustom message-sendmail-f-is-evil nil - "*Non-nil means that \"-f username\" should not be added to the sendmail command line. + "*Non-nil means don't add \"-f username\" to the sendmail command line. Doing so would be even more evil than leaving it out." :group 'message-sending :type 'boolean) @@ -645,7 +651,7 @@ The function `message-supersede' runs this hook." :group 'message-various :type 'hook) -(defcustom message-minibuffer-local-map +(defcustom message-minibuffer-local-map (let ((map (make-sparse-keymap 'message-minibuffer-local-map))) (set-keymap-parent map minibuffer-local-map) map) @@ -731,7 +737,7 @@ If a form, the result from the form will be used instead." "*Function called to return a Distribution header." :group 'message-news :group 'message-headers - :type 'function) + :type '(choice function (const nil))) (defcustom message-expires 14 "Number of days before your article expires." @@ -861,7 +867,7 @@ mail aliases off." "*Directory where Message auto-saves buffers if Gnus isn't running. If nil, Message won't auto-save." :group 'message-buffers - :type 'directory) + :type '(choice directory (const :tag "Don't auto-save" nil))) (defcustom message-buffer-naming-style 'unique "*The way new message buffers are named. @@ -888,7 +894,7 @@ A value of nil means exclude your own name only." regexp)) (defvar message-shoot-gnksa-feet nil - "*A list of GNKSA feet you are allowed to shoot. + "*A list of GNKSA feet you are allowed to shoot. Gnus gives you all the opportunity you could possibly want for shooting yourself in the foot. Also, Gnus allows you to shoot the feet of Good Net-Keeping Seal of Approval. The following are foot @@ -1288,7 +1294,7 @@ The cdr of ech entry is a function for applying the face to a region.") (defcustom message-send-mail-partially-limit 1000000 "The limitation of messages sent as message/partial. The lower bound of message size in characters, beyond which the message -should be sent in several parts. If it is nil, the size is unlimited." +should be sent in several parts. If it is nil, the size is unlimited." :version "21.1" :group 'message-buffers :type '(choice (const :tag "unlimited" nil) @@ -1303,7 +1309,7 @@ The first matched address (not primary one) is used in the From field." (defcustom message-mail-user-agent nil "Like `mail-user-agent'. -Except if it is `nil', use Gnus native MUA; if it is t, use +Except if it is nil, use Gnus native MUA; if it is t, use `mail-user-agent'." :type '(radio (const :tag "Gnus native" :format "%t\n" @@ -1465,22 +1471,22 @@ Except if it is `nil', use Gnus native MUA; if it is t, use `(message-eval-parameter (message-get-parameter ,key ,alist))) (defmacro message-y-or-n-p (question show &rest text) - "Ask QUESTION, displaying the rest of the arguments in a temp. buffer if SHOW" + "Ask QUESTION, displaying remaining args in a temporary buffer if SHOW." `(message-talkative-question 'y-or-n-p ,question ,show ,@text)) -;; Delete the current line (and the next N lines.); (defmacro message-delete-line (&optional n) + "Delete the current line (and the next N lines)." `(delete-region (progn (beginning-of-line) (point)) (progn (forward-line ,(or n 1)) (point)))) (defun message-unquote-tokens (elems) - "Remove double quotes (\") from strings in list." + "Remove double quotes (\") from strings in list ELEMS." (mapcar (lambda (item) - (while (string-match "^\\(.*\\)\"\\(.*\\)$" item) - (setq item (concat (match-string 1 item) - (match-string 2 item)))) - item) - elems)) + (while (string-match "^\\(.*\\)\"\\(.*\\)$" item) + (setq item (concat (match-string 1 item) + (match-string 2 item)))) + item) + elems)) (defun message-tokenize-header (header &optional separator) "Split HEADER into a list of header elements. @@ -1567,7 +1573,7 @@ is used by default." (defun message-fetch-reply-field (header) - "Fetch FIELD from the message we're replying to." + "Fetch field HEADER from the message we're replying to." (let ((buffer (message-eval-parameter message-reply-buffer))) (when (and buffer (buffer-name buffer)) @@ -1590,13 +1596,13 @@ is used by default." (byte-code-function-p form))) (defun message-strip-list-identifiers (subject) - "Remove list identifiers in `gnus-list-identifiers'." + "Remove list identifiers in `gnus-list-identifiers' from string SUBJECT." (require 'gnus-sum) ; for gnus-list-identifiers (let ((regexp (if (stringp gnus-list-identifiers) gnus-list-identifiers (mapconcat 'identity gnus-list-identifiers " *\\|")))) (if (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp - " *\\)\\)+\\(Re: +\\)?\\)") subject) + " *\\)\\)+\\(Re: +\\)?\\)") subject) (concat (substring subject 0 (match-beginning 1)) (or (match-string 3 subject) (match-string 5 subject)) @@ -1605,14 +1611,14 @@ is used by default." subject))) (defun message-strip-subject-re (subject) - "Remove \"Re:\" from subject lines." + "Remove \"Re:\" from subject lines in string SUBJECT." (if (string-match message-subject-re-regexp subject) (substring subject (match-end 0)) subject)) (defun message-remove-header (header &optional is-regexp first reverse) "Remove HEADER in the narrowed buffer. -If REGEXP, HEADER is a regular expression. +If IS-REGEXP, HEADER is a regular expression. If FIRST, only remove the first instance of the header. Return the number of headers removed." (goto-char (point-min)) @@ -1883,9 +1889,9 @@ Point is left at the beginning of the narrowed-to region." ;;;###autoload (defun message-mode () "Major mode for editing mail and news to be sent. -Like Text Mode but with these additional commands: -C-c C-s message-send (send the message) C-c C-c message-send-and-exit -C-c C-d Postpone sending the message C-c C-k Kill the message +Like Text Mode but with these additional commands:\\ +C-c C-s `message-send' (send the message) C-c C-c `message-send-and-exit' +C-c C-d Postpone sending the message C-c C-k Kill the message C-c C-f move to a header field (and create it if there isn't): C-c C-f C-t move to To C-c C-f C-s move to Subject C-c C-f C-c move to Cc C-c C-f C-b move to Bcc @@ -1894,18 +1900,18 @@ C-c C-f move to a header field (and create it if there isn't): C-c C-f C-k move to Keywords C-c C-f C-d move to Distribution C-c C-f C-m move to Mail-Followup-To C-c C-f C-f move to Followup-To -C-c C-t message-insert-to (add a To header to a news followup) -C-c C-n message-insert-newsgroups (add a Newsgroup header to a news reply) -C-c C-b message-goto-body (move to beginning of message text). -C-c C-i message-goto-signature (move to the beginning of the signature). -C-c C-w message-insert-signature (insert `message-signature-file' file). -C-c C-y message-yank-original (insert current message, if any). -C-c C-q message-fill-yanked-message (fill what was yanked). -C-c C-e message-elide-region (elide the text between point and mark). -C-c C-v message-delete-not-region (remove the text outside the region). -C-c C-z message-kill-to-signature (kill the text up to the signature). -C-c C-r message-caesar-buffer-body (rot13 the message body). -M-RET message-newline-and-reformat (break the line and reformat)." +C-c C-t `message-insert-to' (add a To header to a news followup) +C-c C-n `message-insert-newsgroups' (add a Newsgroup header to a news reply) +C-c C-b `message-goto-body' (move to beginning of message text). +C-c C-i `message-goto-signature' (move to the beginning of the signature). +C-c C-w `message-insert-signature' (insert `message-signature-file' file). +C-c C-y `message-yank-original' (insert current message, if any). +C-c C-q `message-fill-yanked-message' (fill what was yanked). +C-c C-e `message-elide-region' (elide the text between point and mark). +C-c C-v `message-delete-not-region' (remove the text outside the region). +C-c C-z `message-kill-to-signature' (kill the text up to the signature). +C-c C-r `message-caesar-buffer-body' (rot13 the message body). +M-RET `message-newline-and-reformat' (break the line and reformat)." (interactive) (kill-all-local-variables) (set (make-local-variable 'message-reply-buffer) nil) @@ -2170,7 +2176,7 @@ With the prefix argument FORCE, insert the header anyway." ;;; Various commands (defun message-delete-not-region (beg end) - "Delete everything in the body of the current message that is outside of the region." + "Delete everything in the body of the current message outside of the region." (interactive "r") (save-excursion (goto-char end) @@ -2206,7 +2212,7 @@ With the prefix argument FORCE, insert the header anyway." (setq beg (point)) ;; Find first line of the paragraph. (if not-break - (while (and (not (eobp)) + (while (and (not (eobp)) (not (looking-at message-cite-prefix-regexp)) (looking-at paragraph-start)) (forward-line 1))) @@ -2267,9 +2273,9 @@ With the prefix argument FORCE, insert the header anyway." (when quoted (insert quoted leading-space))) (if quoted - (let* ((adaptive-fill-regexp + (let* ((adaptive-fill-regexp (regexp-quote (concat quoted leading-space))) - (adaptive-fill-first-line-regexp + (adaptive-fill-first-line-regexp adaptive-fill-regexp )) (fill-paragraph nil)) (fill-paragraph nil)) @@ -2281,7 +2287,7 @@ With the prefix argument FORCE, insert the header anyway." (message-newline-and-reformat t)) (defun message-insert-signature (&optional force) - "Insert a signature. See documentation for the `message-signature' variable." + "Insert a signature. See documentation for variable `message-signature'." (interactive (list 0)) (let* ((signature (cond @@ -2318,7 +2324,7 @@ With the prefix argument FORCE, insert the header anyway." (or (bolp) (insert "\n"))))) (defun message-elide-region (b e) - "Elide the text between point and mark. + "Elide the text in the region. An ellipsis (from `message-elide-ellipsis') will be inserted where the text was killed." (interactive "r") @@ -2328,7 +2334,7 @@ text was killed." (defvar message-caesar-translation-table nil) (defun message-caesar-region (b e &optional n) - "Caesar rotation of region by N, default 13, for decrypting netnews." + "Caesar rotate region B to E by N, default 13, for decrypting netnews." (interactive (list (min (point) (or (mark t) (point))) @@ -2362,8 +2368,8 @@ text was killed." (substring table (+ ?a 26) 255)))) (defun message-caesar-buffer-body (&optional rotnum) - "Caesar rotates all letters in the current buffer by 13 places. -Used to encode/decode possiblyun offensive messages (commonly in net.jokes). + "Caesar rotate all letters in the current buffer by 13 places. +Used to encode/decode possibly offensive messages (commonly in rec.humor). With prefix arg, specifies the number of places to rotate each letter forward. Mail and USENET news headers are not rotated." (interactive (if current-prefix-arg @@ -2632,7 +2638,7 @@ be added to \"References\" field. (funcall message-citation-line-function))))) (defun message-insert-citation-line () - "Function that inserts a simple citation line." + "Insert a simple citation line." (when message-reply-headers (insert (mail-header-from message-reply-headers) " writes:\n\n"))) @@ -2776,7 +2782,7 @@ The text will also be indented the normal way." (delete-frame frame))) (defun message-bury (buffer) - "Bury this mail buffer." + "Bury this mail BUFFER." (let ((newbuf (other-buffer buffer))) (bury-buffer buffer) (if (and (fboundp 'frame-parameters) @@ -3370,7 +3376,7 @@ This sub function is for exclusive use of `message-send-news'." ;;; (defun message-check-element (type) - "Returns non-nil if this type is not to be checked." + "Return non-nil if this TYPE is not to be checked." (if (eq message-syntax-checks 'dont-check-for-anything-just-trust-me) t (let ((able (assq type message-syntax-checks))) @@ -3517,7 +3523,7 @@ This sub function is for exclusive use of `message-send-news'." t (y-or-n-p (format - "Really post to %s unknown group%s: %s " + "Really post to %s unknown group%s: %s? " (if (= (length errors) 1) "this" "these") (if (= (length errors) 1) "" "s") (mapconcat 'identity errors ", "))))))) @@ -3727,8 +3733,8 @@ This sub function is for exclusive use of `message-send-news'." (concat "^" (regexp-quote mail-header-separator) "$")) (while (not (eobp)) (when (not (looking-at "[ \t\n]")) - (setq sum (logxor (ash sum 1) (if (natnump sum) 0 1) - (char-after)))) + (setq sum (logxor (ash sum 1) (if (natnump sum) 0 1) + (char-after)))) (forward-char 1))) sum)) @@ -3772,7 +3778,7 @@ This sub function is for exclusive use of `message-send-news'." (kill-buffer (current-buffer))))) (defun message-output (filename) - "Append this article to Unix/babyl mail file.." + "Append this article to Unix/babyl mail file FILENAME." (if (and (file-readable-p filename) (mail-file-babyl-p filename)) (gnus-output-to-rmail filename t) @@ -4320,7 +4326,7 @@ Headers already prepared in the buffer are not modified." (goto-char (point-max))))) (defun message-shorten-1 (list cut surplus) - ;; Cut SURPLUS elements out of LIST, beginning with CUTth one. + "Cut SURPLUS elements out of LIST, beginning with CUTth one." (setcdr (nthcdr (- cut 2) list) (nthcdr (+ (- cut 2) surplus 1) list))) @@ -4509,13 +4515,13 @@ than 988 characters long, and if they are not, trim them until they are." (setq to (cdr field)) (setq headers (delq field headers))) (let ((mail-user-agent mua)) - (compose-mail to subject + (compose-mail to subject (mapcar (lambda (item) (cons (format "%s" (car item)) (cdr item))) headers) - nil switch-function yank-action actions))))) + nil switch-function yank-action actions))))) ;;;(defvar mc-modes-alist) (defun message-setup-1 (headers &optional replybuffer actions) @@ -5048,14 +5054,14 @@ If ARG, allow editing of the cancellation message." message-id (message-fetch-field "message-id" t) distribution (message-fetch-field "distribution"))) ;; Make sure that this article was written by the user. - (unless (or (and sender - (string-equal - (downcase sender) - (downcase (message-make-sender)))) - (string-equal - (downcase (cadr (std11-extract-address-components + (unless (or (and sender + (string-equal + (downcase sender) + (downcase (message-make-sender)))) + (string-equal + (downcase (cadr (std11-extract-address-components from))) - (downcase (cadr (std11-extract-address-components + (downcase (cadr (std11-extract-address-components (message-make-from)))))) (error "This article is not yours")) ;; Make control message. @@ -5149,7 +5155,8 @@ header line with the old Message-ID." ;;; Washing Subject: (defun message-wash-subject (subject) - "Remove junk like \"Re:\", \"(fwd)\", etc. that was added to the subject by previous forwarders, replyers, etc." + "Remove junk like \"Re:\", \"(fwd)\", etc. added to subject string SUBJECT. +Previous forwarders, replyers, etc. may add it." (with-temp-buffer (insert-string subject) (goto-char (point-min)) @@ -5181,7 +5188,7 @@ header line with the old Message-ID." ;;; Forwarding messages. (defun message-forward-subject-author-subject (subject) - "Generate a subject for a forwarded message. + "Generate a SUBJECT for a forwarded message. The form is: [Source] Subject, where if the original message was mail, Source is the sender, and if the original message was news, Source is the list of newsgroups is was posted to." @@ -5192,7 +5199,7 @@ the list of newsgroups is was posted to." "] " subject)) (defun message-forward-subject-fwd (subject) - "Generate a subject for a forwarded message. + "Generate a SUBJECT for a forwarded message. The form is: Fwd: Subject, where Subject is the original subject of the message." (concat "Fwd: " subject)) @@ -5461,7 +5468,7 @@ which specify the range to operate on." (defalias 'message-exchange-point-and-mark 'exchange-point-and-mark) ;; Support for toolbar -(eval-when-compile +(eval-when-compile (defvar tool-bar-map) (defvar tool-bar-mode)) @@ -5474,7 +5481,7 @@ which specify the range to operate on." (load-path (mm-image-load-path))) ;; Zap some items which aren't so relevant and take ;; up space. - (dolist (key '(print-buffer kill-buffer save-buffer + (dolist (key '(print-buffer kill-buffer save-buffer write-file dired open-file)) (define-key tool-bar-map (vector key) nil)) (tool-bar-add-item-from-menu @@ -5575,7 +5582,7 @@ The following arguments may contain lists of values." (list list)))) (defun message-generate-new-buffer-clone-locals (name &optional varstr) - "Create and return a buffer with a name based on NAME using generate-new-buffer. + "Create and return a buffer with name based on NAME using `generate-new-buffer.' Then clone the local variables and values from the old buffer to the new one, cloning only the locals having a substring matching the regexp varstr." @@ -5727,7 +5734,7 @@ regexp varstr." (defun message-use-alternative-email-as-from () (require 'mail-utils) - (let* ((fields '("To" "Cc")) + (let* ((fields '("To" "Cc")) (emails (split-string (mail-strip-quoted-names @@ -5749,7 +5756,7 @@ regexp varstr." (defun message-options-set (symbol value) (let ((the-cons (assq symbol message-options))) (if the-cons - (if value + (if value (setcdr the-cons value) (setq message-options (delq the-cons message-options))) (and value @@ -5760,10 +5767,10 @@ regexp varstr." (save-restriction (message-narrow-to-headers-or-head) (message-options-set 'message-sender - (mail-strip-quoted-names + (mail-strip-quoted-names (message-fetch-field "from"))) (message-options-set 'message-recipients - (mail-strip-quoted-names + (mail-strip-quoted-names (message-fetch-field "to"))))) (when (featurep 'xemacs) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index ffc8aea..22ba39b 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -127,6 +127,10 @@ mm-inline-image (lambda (handle) (mm-valid-and-fit-image-p 'bmp handle))) + ("image/x-portable-bitmap" + mm-inline-image + (lambda (handle) + (mm-valid-and-fit-image-p 'pbm handle))) ("text/plain" mm-inline-text identity) ("text/enriched" mm-inline-text identity) ("text/richtext" mm-inline-text identity) @@ -296,7 +300,7 @@ to: "Keymap for input viewer with completion.") ;; Should we bind other key to minibuffer-complete-word? -(define-key mm-viewer-completion-map " " 'self-insert-command) +(define-key mm-viewer-completion-map " " 'self-insert-command) ;;; The functions. @@ -840,7 +844,7 @@ external if displayed external." (completing-read "Viewer: " methods)))) (when (string= method "") (error "No method given")) - (if (string-match "^[^% \t]+$" method) + (if (string-match "^[^% \t]+$" method) (setq method (concat method " %s"))) (mm-display-external handle method))) @@ -891,6 +895,8 @@ external if displayed external." "xpm") ((equal type "x-xbitmap") "xbm") + ((equal type "x-portable-bitmap") + "pbm") (t type))) (or (mm-handle-cache handle) (mm-with-unibyte-buffer diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index 3baec82..134d67e 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -162,7 +162,10 @@ The encoding used is returned." (incf n8bit) (forward-char 1) (skip-chars-forward "\x20-\x7f\r\n\t" limit)) - (if (< (* 6 n8bit) (- limit (point-min))) + (if (or (< (* 6 n8bit) (- limit (point-min))) + ;; Don't base64, say, a short line with a single + ;; non-ASCII char when splitting parts by charset. + (= n8bit 1)) 'quoted-printable 'base64)))) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index c1e1c53..0bb8bce 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -44,6 +44,8 @@ (iso-8859-7 greek-iso8859-7) (iso-8859-8 hebrew-iso8859-8) (iso-8859-9 latin-iso8859-9) + (iso-8859-14 latin-iso8859-14) + (iso-8859-15 latin-iso8859-15) (viscii vietnamese-viscii-lower) (iso-2022-jp latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978) (euc-kr korean-ksc5601) diff --git a/lisp/mml.el b/lisp/mml.el index eb7c7f5..de23d5f 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -125,8 +125,11 @@ one charsets.") (mm-find-mime-charset-region point (point)))) (when (and (not raw) (memq nil charsets)) (if (or (memq 'unknown-encoding mml-confirmation-set) - (y-or-n-p - "Message contains characters with unknown encoding. Really send?")) + (prog1 (y-or-n-p + "\ +Message contains characters with unknown encoding. Really send?") + (set (make-local-variable 'mml-confirmation-set) + (push 'unknown-encoding mml-confirmation-set)))) (if (setq use-ascii (or (memq 'use-ascii mml-confirmation-set) (y-or-n-p "Use ASCII as charset?"))) @@ -146,10 +149,13 @@ one charsets.") (when (and warn (not (memq 'multipart mml-confirmation-set)) (not - (y-or-n-p - (format - "Warning: Your message contains more than %d parts. Really send? " - (length nstruct))))) + (prog1 (y-or-n-p + (format + "\ +A message part needs to be split into %d charset parts. Really send? " + (length nstruct))) + (set (make-local-variable 'mml-confirmation-set) + (push 'multipart mml-confirmation-set))))) (error "Edit your message to use only one charset")) (setq struct (nconc nstruct struct))))))) (unless (eobp) diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index e1f43a0..abf2cf5 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -377,7 +377,7 @@ component group will show up when you enter the virtual group.") group article)) (gnus-uncompress-range (gnus-group-expire-articles-1 group)))))) - (sort unexpired '<))) + (sort (delq nil unexpired) '<))) ;;; Internal functions. diff --git a/texi/ChangeLog b/texi/ChangeLog index 30283c0..145512b 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2001-01-10 15:00:00 ShengHuo ZHU + + * gnus.texi (Article Washing): makeinfo 1.69 doesn't grok `anchor'. + 2001-01-07 18:18:53 Lars Magne Ingebrigtsen * gnus.texi (myself): Quote . diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 7718c0e..86a318f 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -7342,7 +7342,7 @@ HZ $B$^$?$O(B HZP $B$r=hM}$7$^$9!#(BHZ ($B$^$?$O(B HZP) $B$OCf9q8l$N5-;v$ \include{xface} @end iflatex @end iftex -@anchor{X-Face} +@c @anchor{X-Face} $B$9$Y$F$N(B X-Face $BMs$rC5$7$FI=<($7$^$9(B(@code{gnus-article-display-x-face})$B!#(B $B$3$NL?Na$OJQ?t(B @code{gnus-article-x-face-command} $B$K$h$C$FM?$($i$l$?4X?t(B $B$K$h$C$F