From: morioka Date: Mon, 16 Feb 1998 14:10:36 +0000 (+0000) Subject: Sync up with qgnus-0.26. X-Git-Tag: gnus-6_7-tomo-199811302358~198 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f91b49b3fae3515c1fb47d46e88266853fe3ede4;p=elisp%2Fgnus.git- Sync up with qgnus-0.26. --- diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 279d419..6786373 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1,5 +1,5 @@ ;;; gnus-art.el --- article mode commands for Semi-gnus -;; Copyright (C) 1996,97 Free Software Foundation, Inc. +;; Copyright (C) 1996,97,98 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -98,7 +98,7 @@ "^Date-Received:" "^References:" "^Control:" "^Xref:" "^Lines:" "^Posted:" "^Relay-Version:" "^Message-ID:" "^Nf-ID:" "^Nf-From:" "^Approved:" "^Sender:" "^Received:" "^Mail-from:") - "All headers that start with this regexp will be hidden. + "*All headers that start with this regexp will be hidden. This variable can also be a list of regexps of headers to be ignored. If `gnus-visible-headers' is non-nil, this variable will be ignored." :type '(choice :custom-show nil @@ -108,7 +108,7 @@ If `gnus-visible-headers' is non-nil, this variable will be ignored." (defcustom gnus-visible-headers "^From:\\|^Newsgroups:\\|^Subject:\\|^Date:\\|^Followup-To:\\|^Reply-To:\\|^Organization:\\|^Summary:\\|^Keywords:\\|^To:\\|^Cc:\\|^Posted-To:\\|^Mail-Copies-To:\\|^Apparently-To:\\|^Gnus-Warning:\\|^Resent-From:\\|X-Sent:" - "All headers that do not match this regexp will be hidden. + "*All headers that do not match this regexp will be hidden. This variable can also be a list of regexp of headers to remain visible. If this variable is non-nil, `gnus-ignored-headers' will be ignored." :type '(repeat :value-to-internal (lambda (widget value) @@ -122,7 +122,7 @@ If this variable is non-nil, `gnus-ignored-headers' will be ignored." (defcustom gnus-sorted-header-list '("^From:" "^Subject:" "^Summary:" "^Keywords:" "^Newsgroups:" "^Followup-To:" "^To:" "^Cc:" "^Date:" "^Organization:") - "This variable is a list of regular expressions. + "*This variable is a list of regular expressions. If it is non-nil, headers that match the regular expressions will be placed first in the article buffer in the sequence specified by this list." @@ -130,7 +130,7 @@ this list." :group 'gnus-article-hiding) (defcustom gnus-boring-article-headers '(empty followup-to reply-to) - "Headers that are only to be displayed if they have interesting data. + "*Headers that are only to be displayed if they have interesting data. Possible values in this list are `empty', `newsgroups', `followup-to', `reply-to', `date', `long-to', and `many-to'." :type '(set (const :tag "Headers with no content." empty) @@ -143,7 +143,7 @@ Possible values in this list are `empty', `newsgroups', `followup-to', :group 'gnus-article-hiding) (defcustom gnus-signature-separator '("^-- $" "^-- *$") - "Regexp matching signature separator. + "*Regexp matching signature separator. This can also be a list of regexps. In that case, it will be checked from head to tail looking for a separator. Searches will be done from the end of the buffer." @@ -151,7 +151,7 @@ the end of the buffer." :group 'gnus-article-signature) (defcustom gnus-signature-limit nil - "Provide a limit to what is considered a signature. + "*Provide a limit to what is considered a signature. If it is a number, no signature may not be longer (in characters) than that number. If it is a floating point number, no signature may be longer (in lines) than that number. If it is a function, the function @@ -165,20 +165,20 @@ regexp. If it matches, the text in question is not a signature." :group 'gnus-article-signature) (defcustom gnus-hidden-properties '(invisible t intangible t) - "Property list to use for hiding text." + "*Property list to use for hiding text." :type 'sexp :group 'gnus-article-hiding) (defcustom gnus-article-x-face-command "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -" - "String or function to be executed to display an X-Face header. + "*String or function to be executed to display an X-Face header. If it is a string, the command will be executed in a sub-shell asynchronously. The compressed face will be piped to this command." :type 'string ;Leave function case to Lisp. :group 'gnus-article-washing) (defcustom gnus-article-x-face-too-ugly nil - "Regexp matching posters whose face shouldn't be shown automatically." + "*Regexp matching posters whose face shouldn't be shown automatically." :type '(choice regexp (const nil)) :group 'gnus-article-washing) @@ -201,7 +201,7 @@ asynchronously. The compressed face will be piped to this command." (format format (car spec) (cadr spec)) 2 3 (intern (format "gnus-emphasis-%s" (caddr spec))))) types))) - "Alist that says how to fontify certain phrases. + "*Alist that says how to fontify certain phrases. Each item looks like this: (\"_\\\\(\\\\w+\\\\)_\" 0 1 'underline) @@ -249,7 +249,7 @@ Esample: (_/*word*/_)." :group 'gnus-article-emphasis) (defcustom gnus-article-time-format "%a, %b %d %Y %T %Z" - "Format for display of Date headers in article bodies. + "*Format for display of Date headers in article bodies. See `format-time-string' for the possible values. The variable can also be function, which should return a complete Date @@ -283,7 +283,7 @@ each invocation of the saving commands." (sexp :tag "once" :format "%t\n" :value t))) (defcustom gnus-saved-headers gnus-visible-headers - "Headers to keep if `gnus-save-all-headers' is nil. + "*Headers to keep if `gnus-save-all-headers' is nil. If `gnus-save-all-headers' is non-nil, this variable will be ignored. If that variable is nil, however, all headers that match this regexp will be kept while the rest will be deleted before saving." @@ -291,7 +291,7 @@ will be kept while the rest will be deleted before saving." :type 'regexp) (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail - "A function to save articles in your favourite format. + "*A function to save articles in your favourite format. The function must be interactively callable (in other words, it must be an Emacs command). @@ -312,25 +312,25 @@ Gnus provides the following functions: (function-item gnus-summary-write-to-file))) (defcustom gnus-rmail-save-name 'gnus-plain-save-name - "A function generating a file name to save articles in Rmail format. + "*A function generating a file name to save articles in Rmail format. The function is called with NEWSGROUP, HEADERS, and optional LAST-FILE." :group 'gnus-article-saving :type 'function) (defcustom gnus-mail-save-name 'gnus-plain-save-name - "A function generating a file name to save articles in Unix mail format. + "*A function generating a file name to save articles in Unix mail format. The function is called with NEWSGROUP, HEADERS, and optional LAST-FILE." :group 'gnus-article-saving :type 'function) (defcustom gnus-folder-save-name 'gnus-folder-save-name - "A function generating a file name to save articles in MH folder. + "*A function generating a file name to save articles in MH folder. The function is called with NEWSGROUP, HEADERS, and optional LAST-FOLDER." :group 'gnus-article-saving :type 'function) (defcustom gnus-file-save-name 'gnus-numeric-save-name - "A function generating a file name to save articles in article format. + "*A function generating a file name to save articles in article format. The function is called with NEWSGROUP, HEADERS, and optional LAST-FILE." :group 'gnus-article-saving @@ -339,7 +339,7 @@ LAST-FILE." (defcustom gnus-split-methods '((gnus-article-archive-name) (gnus-article-nndoc-name)) - "Variable used to suggest where articles are to be saved. + "*Variable used to suggest where articles are to be saved. For instance, if you would like to save articles related to Gnus in the file \"gnus-stuff\", and articles related to VM in \"vm-stuff\", you could set this variable to something like: @@ -369,7 +369,7 @@ be used as possible file names." :type 'boolean) (defcustom gnus-show-mime-method 'gnus-article-preview-mime-message - "Function to process a MIME message. + "*Function to process a MIME message. The function is called from the article buffer." :group 'gnus-article-mime :type 'function) @@ -415,7 +415,7 @@ If you want to run a special decoding program like nkf, use this hook." :group 'gnus-article-various) (defcustom gnus-article-button-face 'bold - "Face used for highlighting buttons in the article buffer. + "*Face used for highlighting buttons in the article buffer. An article button is a piece of text that you can activate by pressing `RET' or `mouse-2' above it." @@ -423,7 +423,7 @@ An article button is a piece of text that you can activate by pressing :group 'gnus-article-buttons) (defcustom gnus-article-mouse-face 'highlight - "Face used for mouse highlighting in the article buffer. + "*Face used for mouse highlighting in the article buffer. Article buttons will be displayed in this face when the cursor is above them." @@ -431,7 +431,7 @@ above them." :group 'gnus-article-buttons) (defcustom gnus-signature-face 'gnus-signature-face - "Face used for highlighting a signature in the article buffer. + "*Face used for highlighting a signature in the article buffer. Obsolete; use the face `gnus-signature-face' for customizations instead." :type 'face :group 'gnus-article-highlight @@ -513,7 +513,7 @@ Obsolete; use the face `gnus-signature-face' for customizations instead." ("Subject" nil gnus-header-subject-face) ("Newsgroups:.*," nil gnus-header-newsgroups-face) ("" gnus-header-name-face gnus-header-content-face)) - "Controls highlighting of article header. + "*Controls highlighting of article header. An alist of the form (HEADER NAME CONTENT). @@ -966,7 +966,7 @@ always hide." (gnus-article-hide-text-type (match-beginning 0) (match-end 0) 'pgp)) (widen)) - (run-hooks 'gnus-article-hide-pgp-hook)))))) + (gnus-run-hooks 'gnus-article-hide-pgp-hook)))))) (defun article-hide-pem (&optional arg) "Toggle hiding of any PEM headers and signatures in the current article. @@ -1857,7 +1857,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is (define-key gnus-article-mode-map [menu-bar post] (cons "Post" gnus-summary-post-menu))) - (run-hooks 'gnus-article-menu-hook))) + (gnus-run-hooks 'gnus-article-menu-hook))) (defun gnus-article-mode () "Major mode for displaying an article. @@ -1893,7 +1893,7 @@ commands: (buffer-disable-undo (current-buffer)) (setq buffer-read-only t) (set-syntax-table gnus-article-mode-syntax-table) - (run-hooks 'gnus-article-mode-hook)) + (gnus-run-hooks 'gnus-article-mode-hook)) (defun gnus-article-setup-buffer () "Initialize the article buffer." @@ -2072,10 +2072,10 @@ If ALL-HEADERS is non-nil, no headers are hidden." (setq gnus-current-headers nil)) (gnus-summary-goto-subject gnus-current-article) (gnus-summary-show-thread) - (run-hooks 'gnus-mark-article-hook) + (gnus-run-hooks 'gnus-mark-article-hook) (gnus-set-mode-line 'summary) (when (gnus-visual-p 'article-highlight 'highlight) - (run-hooks 'gnus-visual-mark-article-hook)) + (gnus-run-hooks 'gnus-visual-mark-article-hook)) ;; Set the global newsgroup variables here. ;; Suggested by Jim Sisolak ;; . @@ -2095,8 +2095,8 @@ If ALL-HEADERS is non-nil, no headers are hidden." ;; Hooks for getting information from the article. ;; This hook must be called before being narrowed. (let (buffer-read-only) - (run-hooks 'internal-hook) - (run-hooks 'gnus-article-prepare-hook) + (gnus-run-hooks 'internal-hook) + (gnus-run-hooks 'gnus-article-prepare-hook) ;; Decode MIME message. (when gnus-show-mime (if (or (not gnus-strict-mime) @@ -2104,7 +2104,7 @@ If ALL-HEADERS is non-nil, no headers are hidden." (funcall gnus-show-mime-method) (funcall gnus-decode-encoded-word-method))) ;; Perform the article display hooks. - (run-hooks 'gnus-article-display-hook)) + (gnus-run-hooks 'gnus-article-display-hook)) ;; Do page break. (goto-char (point-min)) (setq gnus-page-broken @@ -2526,7 +2526,7 @@ If given a prefix, show the hidden text instead." ;;; (defcustom gnus-article-edit-mode-hook nil - "Hook run in article edit mode buffers." + "*Hook run in article edit mode buffers." :group 'gnus-article-various :type 'hook) @@ -2560,7 +2560,7 @@ This is an extended text-mode. (setq buffer-read-only nil) (buffer-enable-undo) (widen) - (run-hooks 'text-mode 'gnus-article-edit-mode-hook)) + (gnus-run-hooks 'text-mode 'gnus-article-edit-mode-hook)) (defun gnus-article-edit (&optional force) "Edit the current article. @@ -2676,7 +2676,7 @@ groups." ;;; Internal Variables: (defcustom gnus-button-url-regexp "\\b\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\([-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,]\\|\\w\\)+\\([-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)" - "Regular expression that matches URLs." + "*Regular expression that matches URLs." :group 'gnus-article-buttons :type 'regexp) @@ -2695,7 +2695,7 @@ groups." ("]*\\)>" 0 t gnus-button-embedded-url 1) ;; Raw URLs. (,gnus-button-url-regexp 0 t gnus-button-url 0)) - "Alist of regexps matching buttons in article bodies. + "*Alist of regexps matching buttons in article bodies. Each entry has the form (REGEXP BUTTON FORM CALLBACK PAR...), where REGEXP: is the string matching text around the button, @@ -2727,7 +2727,7 @@ variable it the real callback function." ("^[^:]+:" ,gnus-button-url-regexp 0 t gnus-button-url 0) ("^[^:]+:" "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)" 1 t gnus-button-message-id 3)) - "Alist of headers and regexps to match buttons in article heads. + "*Alist of headers and regexps to match buttons in article heads. This alist is very similar to `gnus-button-alist', except that each alist has an additional HEADER element first in each entry: