From f85b75c0de6214d48993efc82a3ba650df7056c2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 8 Jul 2003 22:05:35 +0000 Subject: [PATCH] Synch to Gnus 200307081528. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/gnus-mailcap.el | 4 ++-- lisp/mm-bodies.el | 2 +- lisp/mm-decode.el | 28 +++++++++++++++------------- lisp/mm-uu.el | 4 ++-- lisp/mml.el | 8 ++++---- 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 176ebf6..eef1806 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,20 @@ 2003-07-08 Jesper Harder + * mailcap.el (mailcap-parse-args-syntax-table) + (mailcap-viewer-passes-test): Docstring fix. + + * mm-bodies.el (mm-long-lines-p): Docstring fix. + + * mm-decode.el (mm-w3m-safe-url-regexp, mm-verify-option) + (mm-decrypt-option, mm-handle-set-external-undisplayer) + (mm-file-name-replace-whitespace): Docstring fix. + + * mm-uu.el (mm-uu-emacs-sources-regexp): Docstring fix. + (mm-uu-pgp-signed-test): Fix message. + + * mml.el (mml-tweak-sexp-alist): Docstring fix. + (mml-parse-1, mml-insert-mime-headers): Fix message. + * message.el (message-archive-header) (message-subscribed-address-functions) (message-subscribed-addresses, message-subscribed-regexps) diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index 1752cf7..d397fc4 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -47,7 +47,7 @@ (modify-syntax-entry ?{ "(" table) (modify-syntax-entry ?} ")" table) table) - "A syntax table for parsing sgml attributes.") + "A syntax table for parsing SGML attributes.") (eval-and-compile (when (featurep 'xemacs) @@ -627,7 +627,7 @@ Also return non-nil if no test clause is present." (defun mailcap-viewer-passes-test (viewer-info type-info) "Return non-nil iff viewer specified by VIEWER-INFO passes its test clause. -Also retun non-nil if it has no test clause. TYPE-INFO is an argument +Also return non-nil if it has no test clause. TYPE-INFO is an argument to supply to the test." (let* ((test-info (assq 'test viewer-info)) (test (cdr test-info)) diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 219c903..bc6f4f0 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -109,7 +109,7 @@ If no encoding was done, nil is returned." )))))) (defun mm-long-lines-p (length) - "Say whether any of the lines in the buffer is longer than LINES." + "Say whether any of the lines in the buffer is longer than LENGTH." (save-excursion (goto-char (point-min)) (end-of-line) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index d7b1c73..b3e13fe 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -134,13 +134,14 @@ the documentation for the option `mm-w3m-safe-url-regexp'." :group 'mime-display) (defcustom mm-w3m-safe-url-regexp "\\`cid:" - "Regexp that matches safe url names. Some HTML mails might have a -trick of spammers using tags. It is likely to be intended to -verify whether you have read the mail. You can prevent your personal -informations from leaking by setting this to the regexp which matches -the safe url names. The value of the variable `w3m-safe-url-regexp' -will be bound with this value. You may set this value to nil if you -consider all the urls to be safe." + "Regexp that matches safe url names. +Some HTML mails might have a trick of spammers using tags. +It is likely to be intended to verify whether you have read the +mail. You can prevent your personal informations from leaking by +setting this to the regexp which matches the safe url names. The +value of the variable `w3m-safe-url-regexp' will be bound with +this value. You may set this value to nil if you consider all +urls to be safe." :type '(choice (regexp :tag "Regexp") (const :tag "All URLs are safe" nil)) :group 'mime-display) @@ -384,7 +385,7 @@ If not set, `default-directory' will be used." (defcustom mm-verify-option 'never "Option of verifying signed parts. `never', not verify; `always', always verify; -`known', only verify known protocols. Otherwise, ask user." +`known', only verify known protocols. Otherwise, ask user." :type '(choice (item always) (item never) (item :tag "only known protocols" known) @@ -402,7 +403,7 @@ If not set, `default-directory' will be used." (defcustom mm-decrypt-option nil "Option of decrypting encrypted parts. `never', not decrypt; `always', always decrypt; -`known', only decrypt known protocols. Otherwise, ask user." +`known', only decrypt known protocols. Otherwise, ask user." :type '(choice (item always) (item never) (item :tag "only known protocols" known) @@ -458,8 +459,9 @@ The original alist is not modified. See also `destructive-alist-to-plist'." (throw 'found t)))))) (defun mm-handle-set-external-undisplayer (handle function) - "Set the undisplayer for this handle; postpone undisplaying of viewers -for types in mm-keep-viewer-alive-types." + "Set the undisplayer for HANDLE to FUNCTION. +Postpone undisplaying of viewers for types in +`mm-keep-viewer-alive-types'." (if (mm-keep-viewer-alive-p handle) (let ((new-handle (copy-sequence handle))) (mm-handle-set-undisplayer new-handle function) @@ -1005,8 +1007,8 @@ external if displayed external." (defun mm-file-name-replace-whitespace (file-name) "Replace whitespace characters in FILE-NAME with underscores. -Set `mm-file-name-replace-whitespace' to any other string if you do not -like underscores." +Set the option `mm-file-name-replace-whitespace' to any other +string if you do not like underscores." (let ((s (or mm-file-name-replace-whitespace "_"))) (while (string-match "\\s-" file-name) (setq file-name (replace-match s t t file-name)))) diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index a3cad89..269a787 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -76,7 +76,7 @@ decoder, such as hexbin." This can be either \"inline\" or \"attachment\".") (defvar mm-uu-emacs-sources-regexp "gnu\\.emacs\\.sources" - "The regexp of emacs sources groups.") + "The regexp of Emacs sources groups.") (defcustom mm-uu-diff-groups-regexp "gnus\\.commits" "*Regexp matching diff groups." @@ -335,7 +335,7 @@ Return that buffer." ((eq mm-verify-option 'never) nil) ((eq mm-verify-option 'always) t) ((eq mm-verify-option 'known) t) - (t (y-or-n-p "Verify pgp signed part?"))))) + (t (y-or-n-p "Verify pgp signed part? "))))) (eval-when-compile (defvar gnus-newsgroup-charset)) diff --git a/lisp/mml.el b/lisp/mml.el index 415102d..929d5c2 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -70,7 +70,7 @@ handle to tweak the part.") (defvar mml-tweak-sexp-alist '((mml-externalize-attachments . mml-tweak-externalize-attachments)) "A list of (SEXP . FUNCTION) for tweaking MML parts. -SEXP is a s-expression. If the evaluation of SEXP is non-nil, FUNCTION +SEXP is an s-expression. If the evaluation of SEXP is non-nil, FUNCTION is called. FUNCTION is a Lisp function which is called with the MML handle to tweak the part.") @@ -210,12 +210,12 @@ one charsets.") (if (or (memq 'unknown-encoding mml-confirmation-set) (message-options-get 'unknown-encoding) (and (y-or-n-p "\ -Message contains characters with unknown encoding. Really send?") +Message contains characters with unknown encoding. Really send? ") (message-options-set 'unknown-encoding t))) (if (setq use-ascii (or (memq 'use-ascii mml-confirmation-set) (message-options-get 'use-ascii) - (and (y-or-n-p "Use ASCII as charset?") + (and (y-or-n-p "Use ASCII as charset? ") (message-options-set 'use-ascii t)))) (setq charsets (delq nil charsets)) (setq warn nil)) @@ -611,7 +611,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (not (equal type mml-generate-default-type))) (when (consp charset) (error - "Can't encode a part with several charsets.")) + "Can't encode a part with several charsets")) (insert "Content-Type: " type) (when charset (insert "; " (mail-header-encode-parameter -- 1.7.10.4