Changeset 3526 for branches/2.2/lisp/gnus/gnus-art.el

Timestamp:

10/31/04 15:41:47 (4 years ago)

Author:

miyoshi

Message:

* fringe.c: Sync up with Emacs CVS HEAD.

* xdisp.c (handle_single_display_prop): Merge codes related with
the changes in fringe.c.

* xfaces.c: Update declarations.

* w32console.c: Partially sync up with Emacs CVS HEAD.

* mw32term.c (note_mouse_highlight): Update arguments for
window_from_coordinates().
(glyph_rect): Ditto.
(mw32_message_loop): Ditto.
Merge codes related with the changes in fringe.c.

* lisp.h: Update declarations.

* keymap.c: Update declarations.
(describe_command): Add a dummy argument.
(describe_translation): Ditto.

* keyboard.c (make_lispy_event): Update arguments for
window_from_coordinates().
(make_lispy_movement): Ditto.

* dispextern.h: Update declarations.

* eval.c: Ditto.

* alloc.c (make_string): Sync up with Emacs CVS HEAD.
(make_unibyte_string): Ditto.
(make_multibyte_string): Ditto.

* lisp/cus-load.el: Update.

* lisp/loaddefs.el: Ditto.

* lisp/calc/calc-embed.el: Sync up with Emacs CVS HEAD.

* lisp/calc/calc-graph.el: Ditto.

* lisp/calc/calc-help.el: Ditto.

* lisp/calc/calc-misc.el: Ditto.

* lisp/calc/calc-units.el: Ditto.

* lisp/calc/calc.el: Ditto.

* lisp/calendar/cal-iso.el: Ditto.

* lisp/calendar/cal-menu.el: Ditto.

* lisp/calendar/calendar.el: Ditto.

* lisp/calendar/diary-lib.el: Ditto.

* lisp/calendar/holidays.el: Ditto.

* lisp/calendar/time-date.el: Ditto.

* lisp/emacs-lisp/cl-macs.el: Ditto.

* lisp/emacs-lisp/helper.el: Ditto.

* lisp/emulation/cua-base.el: Ditto.

* lisp/emulation/cua-rect.el: Ditto.

* lisp/eshell/em-pred.el: Ditto.

* lisp/eshell/esh-ext.el: Ditto.

* lisp/gnus/ChangeLog: Ditto.

* lisp/gnus/binhex.el: Ditto.

* lisp/gnus/catchup.xpm: Ditto.

* lisp/gnus/cu-exit.xpm: Ditto.

* lisp/gnus/describe-group.xpm: Ditto.

* lisp/gnus/earcon.el: Ditto.

* lisp/gnus/exit-gnus.xpm: Ditto.

* lisp/gnus/exit-summ.xpm: Ditto.

* lisp/gnus/flow-fill.el: Ditto.

* lisp/gnus/followup.xpm: Ditto.

* lisp/gnus/fuwo.xpm: Ditto.

* lisp/gnus/get-news.xpm: Ditto.

* lisp/gnus/gnntg.xpm: Ditto.

* lisp/gnus/gnus-agent.el: Ditto.

* lisp/gnus/gnus-art.el: Ditto.

* lisp/gnus/gnus-async.el: Ditto.

* lisp/gnus/gnus-audio.el: Ditto.

* lisp/gnus/gnus-bcklg.el: Ditto.

* lisp/gnus/gnus-cache.el: Ditto.

* lisp/gnus/gnus-cite.el: Ditto.

* lisp/gnus/gnus-cus.el: Ditto.

* lisp/gnus/gnus-demon.el: Ditto.

* lisp/gnus/gnus-draft.el: Ditto.

* lisp/gnus/gnus-dup.el: Ditto.

* lisp/gnus/gnus-eform.el: Ditto.

* lisp/gnus/gnus-ems.el: Ditto.

* lisp/gnus/gnus-gl.el: Ditto.

* lisp/gnus/gnus-group.el: Ditto.

* lisp/gnus/gnus-int.el: Ditto.

* lisp/gnus/gnus-kill.el: Ditto.

* lisp/gnus/gnus-logic.el: Ditto.

* lisp/gnus/gnus-mh.el: Ditto.

* lisp/gnus/gnus-ml.el: Ditto.

* lisp/gnus/gnus-mlspl.el: Ditto.

* lisp/gnus/gnus-msg.el: Ditto.

* lisp/gnus/gnus-nocem.el: Ditto.

* lisp/gnus/gnus-range.el: Ditto.

* lisp/gnus/gnus-salt.el: Ditto.

* lisp/gnus/gnus-score.el: Ditto.

* lisp/gnus/gnus-setup.el: Ditto.

* lisp/gnus/gnus-soup.el: Ditto.

* lisp/gnus/gnus-spec.el: Ditto.

* lisp/gnus/gnus-srvr.el: Ditto.

* lisp/gnus/gnus-start.el: Ditto.

* lisp/gnus/gnus-sum.el: Ditto.

* lisp/gnus/gnus-topic.el: Ditto.

* lisp/gnus/gnus-undo.el: Ditto.

* lisp/gnus/gnus-util.el: Ditto.

* lisp/gnus/gnus-uu.el: Ditto.

* lisp/gnus/gnus-vm.el: Ditto.

* lisp/gnus/gnus-win.el: Ditto.

* lisp/gnus/gnus.el: Ditto.

* lisp/gnus/ietf-drums.el: Ditto.

* lisp/gnus/imap.el: Ditto.

* lisp/gnus/kill-group.xpm: Ditto.

* lisp/gnus/mail-parse.el: Ditto.

* lisp/gnus/mail-prsvr.el: Ditto.

* lisp/gnus/mail-reply.xpm: Ditto.

* lisp/gnus/mail-source.el: Ditto.

* lisp/gnus/mailcap.el: Ditto.

* lisp/gnus/message.el: Ditto.

* lisp/gnus/messcompat.el: Ditto.

* lisp/gnus/mm-bodies.el: Ditto.

* lisp/gnus/mm-decode.el: Ditto.

* lisp/gnus/mm-encode.el: Ditto.

* lisp/gnus/mm-partial.el: Ditto.

* lisp/gnus/mm-util.el: Ditto.

* lisp/gnus/mm-uu.el: Ditto.

* lisp/gnus/mm-view.el: Ditto.

* lisp/gnus/mml.el: Ditto.

* lisp/gnus/next-ur.xpm: Ditto.

* lisp/gnus/nnagent.el: Ditto.

* lisp/gnus/nnbabyl.el: Ditto.

* lisp/gnus/nndoc.el: Ditto.

* lisp/gnus/nndraft.el: Ditto.

* lisp/gnus/nneething.el: Ditto.

* lisp/gnus/nnfolder.el: Ditto.

* lisp/gnus/nngateway.el: Ditto.

* lisp/gnus/nnheader.el: Ditto.

* lisp/gnus/nnimap.el: Ditto.

* lisp/gnus/nnkiboze.el: Ditto.

* lisp/gnus/nnlistserv.el: Ditto.

* lisp/gnus/nnmail.el: Ditto.

* lisp/gnus/nnmbox.el: Ditto.

* lisp/gnus/nnmh.el: Ditto.

* lisp/gnus/nnml.el: Ditto.

* lisp/gnus/nnoo.el: Ditto.

* lisp/gnus/nnslashdot.el: Ditto.

* lisp/gnus/nnsoup.el: Ditto.

* lisp/gnus/nnspool.el: Ditto.

* lisp/gnus/nntp.el: Ditto.

* lisp/gnus/nnultimate.el: Ditto.

* lisp/gnus/nnvirtual.el: Ditto.

* lisp/gnus/nnwarchive.el: Ditto.

* lisp/gnus/nnweb.el: Ditto.

* lisp/gnus/pop3.el: Ditto.

* lisp/gnus/post.xpm: Ditto.

* lisp/gnus/prev-ur.xpm: Ditto.

* lisp/gnus/qp.el: Ditto.

* lisp/gnus/reply-wo.xpm: Ditto.

* lisp/gnus/reply.xpm: Ditto.

* lisp/gnus/rfc1843.el: Ditto.

* lisp/gnus/rfc2045.el: Ditto.

* lisp/gnus/rfc2047.el: Ditto.

* lisp/gnus/rfc2231.el: Ditto.

* lisp/gnus/rot13.xpm: Ditto.

* lisp/gnus/save-aif.xpm: Ditto.

* lisp/gnus/save-art.xpm: Ditto.

* lisp/gnus/score-mode.el: Ditto.

* lisp/gnus/subscribe.xpm: Ditto.

* lisp/gnus/unsubscribe.xpm: Ditto.

* lisp/gnus/utf7.el: Ditto.

* lisp/gnus/uu-decode.xpm: Ditto.

* lisp/gnus/uu-post.xpm: Ditto.

* lisp/gnus/uudecode.el: Ditto.

* lisp/gnus/webmail.el: Ditto.

* lisp/international/characters.el: Ditto.

* lisp/language/cyrillic.el: Ditto.

* lisp/language/indian.el: Ditto.

* lisp/mail/mail-extr.el: Ditto.

* lisp/mail/smtpmail.el: Ditto.

* lisp/mail/supercite.el: Ditto.

* lisp/menu-bar.el: Ditto.

* lisp/mh-e/ChangeLog: Ditto.

* lisp/mh-e/mh-alias.el: Ditto.

* lisp/mh-e/mh-comp.el: Ditto.

* lisp/mh-e/mh-customize.el: Ditto.

* lisp/mh-e/mh-e.el: Ditto.

* lisp/mh-e/mh-funcs.el: Ditto.

* lisp/mh-e/mh-gnus.el: Ditto.

* lisp/mh-e/mh-identity.el: Ditto.

* lisp/mh-e/mh-inc.el: Ditto.

* lisp/mh-e/mh-index.el: Ditto.

* lisp/mh-e/mh-junk.el: Ditto.

* lisp/mh-e/mh-loaddefs.el: Ditto.

* lisp/mh-e/mh-mime.el: Ditto.

* lisp/mh-e/mh-pick.el: Ditto.

* lisp/mh-e/mh-seq.el: Ditto.

* lisp/mh-e/mh-speed.el: Ditto.

* lisp/mh-e/mh-utils.el: Ditto.

* lisp/mouse-sel.el: Ditto.

* lisp/mouse.el: Ditto.

* lisp/msb.el: Ditto.

* lisp/mwheel.el: Ditto.

* lisp/newcomment.el: Ditto.

* lisp/novice.el: Ditto.

* lisp/outline.el: Ditto.

* lisp/paren.el: Ditto.

* lisp/paths.el: Ditto.

* lisp/play/animate.el: Ditto.

* lisp/play/blackbox.el: Ditto.

* lisp/play/gamegrid.el: Ditto.

* lisp/play/landmark.el: Ditto.

* lisp/play/morse.el: Ditto.

* lisp/play/zone.el: Ditto.

* lisp/printing.el: Ditto.

* lisp/simple.el: Ditto.

* lisp/term/mac-win.el: Ditto.

* lisp/term/x-win.el: Ditto.

* lisp/term/xterm.el: Ditto.

* lisp/textmodes/bibtex.el: Ditto.

* lisp/textmodes/enriched.el: Ditto.

* lisp/textmodes/flyspell.el: Ditto.

* lisp/textmodes/ispell.el: Ditto.

* lisp/textmodes/paragraphs.el: Ditto.

* lisp/textmodes/reftex-auc.el: Ditto.

* lisp/textmodes/tex-mode.el: Ditto.

* lisp/url/ChangeLog: Ditto.

* lisp/url/url-auth.el: Ditto.

* lisp/url/url-cache.el: Ditto.

* lisp/url/url-cookie.el: Ditto.

* lisp/url/url-dired.el: Ditto.

* lisp/url/url-file.el: Ditto.

* lisp/url/url-ftp.el: Ditto.

* lisp/url/url-gw.el: Ditto.

* lisp/url/url-handlers.el: Ditto.

* lisp/url/url-history.el: Ditto.

* lisp/url/url-https.el: Ditto.

* lisp/url/url-irc.el: Ditto.

* lisp/url/url-ldap.el: Ditto.

* lisp/url/url-mailto.el: Ditto.

* lisp/url/url-methods.el: Ditto.

* lisp/url/url-misc.el: Ditto.

* lisp/url/url-news.el: Ditto.

* lisp/url/url-nfs.el: Ditto.

* lisp/url/url-parse.el: Ditto.

* lisp/url/url-privacy.el: Ditto.

* lisp/url/url-util.el: Ditto.

* lisp/url/url-vars.el: Ditto.

* lisp/url/url.el: Ditto.

* lisp/calendar/icalendar.el: New file.

* lisp/gnus/ChangeLog.2: Ditto.

* lisp/gnus/TODO: Ditto.

* lisp/gnus/bar.xbm: Ditto.

* lisp/gnus/bar.xpm: Ditto.

* lisp/gnus/blink.pbm: Ditto.

* lisp/gnus/blink.xpm: Ditto.

* lisp/gnus/braindamaged.xpm: Ditto.

* lisp/gnus/canlock.el: Ditto.

* lisp/gnus/compface.el: Ditto.

* lisp/gnus/cry.xpm: Ditto.

* lisp/gnus/dead.xpm: Ditto.

* lisp/gnus/deuglify.el: Ditto.

* lisp/gnus/dig.el: Ditto.

* lisp/gnus/dns.el: Ditto.

* lisp/gnus/evil.xpm: Ditto.

* lisp/gnus/forced.xpm: Ditto.

* lisp/gnus/frown.xpm: Ditto.

* lisp/gnus/gnus-delay.el: Ditto.

* lisp/gnus/gnus-diary.el: Ditto.

* lisp/gnus/gnus-dired.el: Ditto.

* lisp/gnus/gnus-fun.el: Ditto.

* lisp/gnus/gnus-picon.el: Ditto.

* lisp/gnus/gnus-pointer.xbm: Ditto.

* lisp/gnus/gnus-pointer.xpm: Ditto.

* lisp/gnus/gnus-registry.el: Ditto.

* lisp/gnus/gnus-sieve.el: Ditto.

* lisp/gnus/important.xpm: Ditto.

* lisp/gnus/indifferent.xpm: Ditto.

* lisp/gnus/mm-extern.el: Ditto.

* lisp/gnus/mm-url.el: Ditto.

* lisp/gnus/mml-sec.el: Ditto.

* lisp/gnus/mml-smime.el: Ditto.

* lisp/gnus/mml1991.el: Ditto.

* lisp/gnus/mml2015.el: Ditto.

* lisp/gnus/nndb.el: Ditto.

* lisp/gnus/nndiary.el: Ditto.

* lisp/gnus/gnus.xbm: Ditto.

* lisp/gnus/gnus.xpm: Ditto.

* lisp/gnus/grin.xpm: Ditto.

* lisp/gnus/hex-util.el: Ditto.

* lisp/gnus/html2text.el: Ditto.

* lisp/gnus/nnmaildir.el: Ditto.

* lisp/gnus/nnnil.el: Ditto.

* lisp/gnus/nnrss.el: Ditto.

* lisp/gnus/nnwfm.el: Ditto.

* lisp/gnus/pgg-def.el: Ditto.

* lisp/gnus/pgg-gpg.el: Ditto.

* lisp/gnus/pgg-parse.el: Ditto.

* lisp/gnus/pgg-pgp.el: Ditto.

* lisp/gnus/pgg-pgp5.el: Ditto.

* lisp/gnus/pgg.el: Ditto.

* lisp/gnus/preview.xbm: Ditto.

* lisp/gnus/preview.xpm: Ditto.

* lisp/gnus/receipt.xpm: Ditto.

* lisp/gnus/reverse-smile.xpm: Ditto.

* lisp/gnus/sad.pbm: Ditto.

* lisp/gnus/sad.xpm: Ditto.

* lisp/gnus/sha1.el: Ditto.

* lisp/gnus/sieve-manage.el: Ditto.

* lisp/gnus/sieve-mode.el: Ditto.

* lisp/gnus/sieve.el: Ditto.

* lisp/gnus/smile.xpm: Ditto.

* lisp/gnus/smiley.el: Ditto.

* lisp/gnus/smime.el: Ditto.

* lisp/gnus/spam-report.el: Ditto.

* lisp/gnus/spam-stat.el: Ditto.

* lisp/gnus/spam.el: Ditto.

* lisp/gnus/unimportant.xpm: Ditto.

* lisp/gnus/wry.xpm: Ditto.

* lisp/gnus/yenc.el: Ditto.

* lisp/mh-e/mh-acros.el: Ditto.

* lisp/mh-e/mh-init.el: Ditto.

* lisp/mh-e/mh-print.el: Ditto.

* lisp/net/password.el: Ditto.

* lisp/textmodes/dns-mode.el: Ditto.

* lisp/gnus/gnus-mule.el: Removed.

* lisp/gnus/smiley-ems.el: Ditto.

Files:

• branches/2.2/lisp/gnus/gnus-art.el (modified) (206 diffs)

branches/2.2/lisp/gnus/gnus-art.el

@@ -1 +1 @@
-;;; gnus-art.el --- article mode commands for Gnus
-
-
-
+
+
-
-;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -28 +27 @@
-;;; Code:
-
-
+
+
+
-
-(require 'gnus)
@@ -34 +35 @@
-(require 'gnus-spec)
-(require 'gnus-int)
+(require 'gnus-win)
-(require 'mm-bodies)
-(require 'mail-parse)
@@ -40 +42 @@
-(require 'wid-edit)
-(require 'mm-uu)
+(require 'message)
+
+(autoload 'gnus-msg-mail "gnus-msg" nil t)
+(autoload 'gnus-button-mailto "gnus-msg")
+(autoload 'gnus-button-reply "gnus-msg" nil t)
-
-(defgroup gnus-article nil
-  "Article display."
-The 
+
-  :group 'gnus)
-
@@ -103 +110 @@
-
-(defcustom gnus-ignored-headers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  "*All headers that start with this regexp will be hidden.
-This variable can also be a list of regexps of headers to be ignored.
@@ -139 +160 @@
-
-(defcustom gnus-visible-headers
-
+Mail-Followup-To:\\|^
-  "*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.
@@ -163 +184 @@
-(defcustom gnus-boring-article-headers '(empty followup-to reply-to)
-  "Headers that are only to be displayed if they have interesting data.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  :type '(set (const :tag "Headers with no content." empty)
-
-
-
+
+
+
+
+
+
-              (const :tag "Date less than four days old." date)
-Very long To and/or Cc header
+To and/or Cc longer than 1024 characters
-              (const :tag "Multiple To and/or Cc headers." many-to))
+  :group 'gnus-article-hiding)
+
+(defcustom gnus-article-skip-boring nil
+  "Skip over text that is not worth reading.
+By default, if you set this t, then Gnus will display citations and
+signatures, but will never scroll down to show you a page consisting
+only of boring text.  Boring text is controlled by
+`gnus-article-boring-faces'."
+  :version "21.4"
+  :type 'boolean
-  :group 'gnus-article-hiding)
-
@@ -201 +245 @@
-  :group 'gnus-article-hiding)
-
-
-
-
+
+
-(defcustom gnus-article-x-face-command
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
-display -"))
@@ -218 +260 @@
-If it is a string, the command will be executed in a sub-shell
-asynchronously.  The compressed face will be piped to this command."
-'
-article-display-xface
+`
+display-x-face-in-from
-                 function)
-  :version "21.1"
+  :group 'gnus-picon
-  :group 'gnus-article-washing)
-
@@ -232 +275 @@
-  "Banner alist for stripping.
-For example,
-e
+\\\\(e\\\\|Yahoo! \\\\)
-  :version "21.1"
-  :type '(repeat (cons symbol regexp))
-  :group 'gnus-article-washing)
-
+(gnus-define-group-parameter
+ banner
+ :variable-document
+ "Alist of regexps (to match group names) and banner."
+ :variable-group gnus-article-washing
+ :parameter-type
+ '(choice :tag "Banner"
+          :value nil
+          (const :tag "Remove signature" signature)
+          (symbol :tag "Item in `gnus-article-banner-alist'" none)
+          regexp
+          (const :tag "None" nil))
+ :parameter-document
+ "If non-nil, specify how to remove `banners' from articles.
+
+Symbol `signature' means to remove signatures delimited by
+`gnus-signature-separator'.  Any other symbol is used to look up a
+regular expression to match the banner in `gnus-article-banner-alist'.
+A string is used as a regular expression to match the banner
+directly.")
+
+(defcustom gnus-article-address-banner-alist nil
+  "Alist of mail addresses and banners.
+Each element has the form (ADDRESS . BANNER), where ADDRESS is a regexp
+to match a mail address in the From: header, BANNER is one of a symbol
+`signature', an item in `gnus-article-banner-alist', a regexp and nil.
+If ADDRESS matches author's mail address, it will remove things like
+advertisements.  For example:
+
+\((\"@yoo-hoo\\\\.co\\\\.jp\\\\'\" . \"\\n_+\\nDo You Yoo-hoo!\\\\?\\n.*\\n.*\\n\"))
+"
+  :type '(repeat
+          (cons
+           (regexp :tag "Address")
+           (choice :tag "Banner" :value nil
+                   (const :tag "Remove signature" signature)
+                   (symbol :tag "Item in `gnus-article-banner-alist'" none)
+                   regexp
+                   (const :tag "None" nil))))
+  :group 'gnus-article-washing)
+
-(defcustom gnus-emphasis-alist
-  (let ((format
-[-\"]\\|\\s(\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\\(\\s-\\|[-,;:\"]\\s-\\|[?!.]+\\s-\\|\\s)
+\\=\\|[-\"]\\|\\s(\\)\\(%s\\(\\w+\\(\\s-+\\w+\\)*[.,]?\\)%s\\)\\(\\([-,.;:!?\"]\\|\\s)\\)+\\s-\\|[?!.]\\s-\\|\\s)\\|\\s-
-        (types
-
+
+
-           ("/" "/" italic)
-           ("\\*" "\\*" bold)
-           ("_/" "/_" underline-italic)
-           ("_\\*" "\\*_" underline-bold)
-           ("\\*/" "/\\*" bold-italic)
-           ("_\\*/" "/\\*_" underline-bold-italic))))
-
-
-
+
-         (lambda (spec)
-           (list
-            (format format (car spec) (cadr spec))
-            2 3 (intern (format "gnus-emphasis-%s" (nth 2 spec)))))
-
+
+
+
+
+
-  "*Alist that says how to fontify certain phrases.
-Each item looks like this:
@@ -282 +368 @@
-  :type 'regexp)
-
-weight bold
+bold t
-  "Face used for displaying strong emphasized text (*word*)."
-  :group 'gnus-article-emphasis)
-
-slant italic
+italic t
-  "Face used for displaying italic emphasized text (/word/)."
-  :group 'gnus-article-emphasis)
@@ -294 +380 @@
-  :group 'gnus-article-emphasis)
-
-weight bold
+bold t
-  "Face used for displaying underlined bold emphasized text (_*word*_)."
-  :group 'gnus-article-emphasis)
-
-slant italic
+italic t
-  "Face used for displaying underlined italic emphasized text (_/word/_)."
-  :group 'gnus-article-emphasis)
-
-weight bold :slant italic
+bold t :italic t
-  "Face used for displaying bold italic emphasized text (/*word*/)."
-  :group 'gnus-article-emphasis)
-
-(defface gnus-emphasis-underline-bold-italic
-weight bold :slant italic
+bold t :italic t
-  "Face used for displaying underlined bold italic emphasized text.
-Example: (_/*word*/_)."
+  :group 'gnus-article-emphasis)
+
+(defface gnus-emphasis-strikethru (if (featurep 'xemacs)
+                                      '((t (:strikethru t)))
+                                    '((t (:strike-through t))))
+  "Face used for displaying strike-through text (-word-)."
-  :group 'gnus-article-emphasis)
-
@@ -368 +460 @@
-* gnus-summary-save-in-folder (MH folder)
-* gnus-summary-save-in-file (article format)
+* gnus-summary-save-body-in-file (article body)
-* gnus-summary-save-in-vm (use VM's folder format)
-* gnus-summary-write-to-file (article format -- overwrite)."
@@ -375 +468 @@
-                (function-item gnus-summary-save-in-folder)
-                (function-item gnus-summary-save-in-file)
+                (function-item gnus-summary-save-body-in-file)
-                (function-item gnus-summary-save-in-vm)
-                (function-item gnus-summary-write-to-file)))
@@ -453 +547 @@
-  :group 'gnus-article-various)
-
+(when (featurep 'xemacs)
+  ;; Extracted from gnus-xmas-define in order to preserve user settings
+  (when (fboundp 'turn-off-scroll-in-place)
+    (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
+  ;; Extracted from gnus-xmas-redefine in order to preserve user settings
+  (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add))
+
-(defcustom gnus-article-menu-hook nil
-  "*Hook run after the creation of the article mode menu."
@@ -463 +564 @@
-  :group 'gnus-article-various)
-
-
-
-
-
+
+
-
-(defcustom gnus-article-button-face 'bold
@@ -493 +592 @@
-(defface gnus-signature-face
-  '((t
-slant italic
+italic t
-  "Face used for highlighting a signature in the article buffer."
-  :group 'gnus-article-highlight
@@ -506 +605 @@
-     (:foreground "red3"))
-    (t
-slant italic
+italic t
-  "Face used for displaying from headers."
-  :group 'gnus-article-headers
@@ -519 +618 @@
-     (:foreground "red4"))
-    (t
-weight bold :slant italic
+bold t :italic t
-  "Face used for displaying subject headers."
-  :group 'gnus-article-headers
@@ -527 +626 @@
-  '((((class color)
-      (background dark))
-slant italic
+italic t
-    (((class color)
-      (background light))
-slant italic
+italic t
-    (t
-
-
+
+
+
+
-  :group 'gnus-article-headers
-  :group 'gnus-article-highlight)
@@ -545 +646 @@
-     (:foreground "maroon"))
-    (t
-weight bold
+bold t
-  "Face used for displaying header names."
-  :group 'gnus-article-headers
@@ -553 +654 @@
-  '((((class color)
-      (background dark))
-slant italic
+italic t
-    (((class color)
-      (background light))
-slant italic
+italic t
-    (t
-slant italic
+italic t
-  :group 'gnus-article-headers
-  :group 'gnus-article-highlight)
@@ -567 +668 @@
-    ("Newsgroups:.*," nil gnus-header-newsgroups-face)
-    ("" gnus-header-name-face gnus-header-content-face))
-
+s
-
-An alist of the form (HEADER NAME CONTENT).
-
-n
-header 
+
+
-
-The name of each header field will be displayed using the face
- the
-
-
+es
+
+be 
-  :group 'gnus-article-headers
-  :group 'gnus-article-highlight
@@ -589 +690 @@
-
-(defcustom gnus-article-decode-hook
-
+
+
-  "*Hook run to decode charsets in articles."
-  :group 'gnus-article-headers
@@ -603 +705 @@
-
-(defvar gnus-article-dumbquotes-map
-
+
+
-    ("\203" "f")
-    ("\204" ",,")
@@ -616 +719 @@
-    ("\226" "-")
-    ("\227" "--")
+    ("\230" "~")
-    ("\231" "(TM)")
-    ("\233" ">")
@@ -629 +733 @@
-
-(defcustom gnus-unbuttonized-mime-types '(".*/.*")
-
+
+
+
-  :version "21.1"
-  :group 'gnus-article-mime
-  :type '(repeat regexp))
+
+(defcustom gnus-buttonized-mime-types nil
+  "List of MIME types that should be given buttons when rendered inline.
+If set, this variable overrides `gnus-unbuttonized-mime-types'.
+To see e.g. security buttons you could set this to
+`(\"multipart/signed\")'.
+This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil."
+  :version "21.4"
+  :group 'gnus-article-mime
+  :type '(repeat regexp))
+
+(defcustom gnus-inhibit-mime-unbuttonizing nil
+  "If non-nil, all MIME parts get buttons.
+When nil (the default value), then some MIME parts do not get buttons,
+as described by the variables `gnus-buttonized-mime-types' and
+`gnus-unbuttonized-mime-types'."
+  :version "21.4"
+  :type 'boolean)
+
+(defcustom gnus-body-boundary-delimiter "_"
+  "String used to delimit header and body.
+This variable is used by `gnus-article-treat-body-boundary' which can
+be controlled by `gnus-treat-body-boundary'."
+  :version "21.4"
+  :group 'gnus-article-various
+  :type '(choice (item :tag "None" :value nil)
+                 string))
+
+(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces")
+  "Defines the location of the faces database.
+For information on obtaining this database of pretty pictures, please
+see http://www.cs.indiana.edu/picons/ftp/index.html"
+  :version "21.4"
+  :type '(repeat directory)
+  :link '(url-link :tag "download"
+                   "http://www.cs.indiana.edu/picons/ftp/index.html")
+  :link '(custom-manual "(gnus)Picons")
+  :group 'gnus-picon)
+
+(defun gnus-picons-installed-p ()
+  "Say whether picons are installed on your machine."
+  (let ((installed nil))
+    (dolist (database gnus-picon-databases)
+      (when (file-exists-p database)
+        (setq installed t)))
+    installed))
-
-(defcustom gnus-article-mime-part-function nil
@@ -675 +827 @@
-(defcustom gnus-mime-action-alist
-  '(("save to file" . gnus-mime-save-part)
+    ("save and strip" . gnus-mime-save-part-and-strip)
+    ("delete part" . gnus-mime-delete-part)
-    ("display as text" . gnus-mime-inline-part)
-    ("view the part" . gnus-mime-view-part)
-    ("pipe to command" . gnus-mime-pipe-part)
-    ("toggle display" . gnus-article-press-button)
+    ("toggle display" . gnus-article-view-part-as-charset)
-    ("view as type" . gnus-mime-view-part-as-type)
-internalize type" . gnus-mime-internalize-part
-externalize type" . gnus-mime-externalize-part
+view internally" . gnus-mime-view-part-internally
+view externally" . gnus-mime-view-part-externally
-  "An alist of actions that run on the MIME attachment."
-  :version "21.1"
-  :group 'gnus-article-mime
-  :type '(repeat (cons (string :tag "name")
@@ -714 +868 @@
-  "Whether to inhibit treatment.")
-
-las
+
-  "Highlight the signature.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual for details
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-(put 'gnus-treat-highlight-signature 'highlight t)
@@ -725 +880 @@
-  "Add buttons.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual for details
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-(put 'gnus-treat-buttonize 'highlight t)
@@ -733 +889 @@
-  "Add buttons to the head.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-(put 'gnus-treat-buttonize-head 'highlight t)
@@ -745 +902 @@
-  "Emphasize text.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-(put 'gnus-treat-emphasize 'highlight t)
@@ -753 +911 @@
-  "Remove carriage returns.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-
+
+
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-unsplit-urls nil
+  "Remove newlines from within URLs.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-leading-whitespace nil
+  "Remove leading whitespace in headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :version "21.4"
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -760 +937 @@
-  "Hide headers.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -767 +945 @@
-  "Hide boring headers.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -774 +953 @@
-  "Hide the signature.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -781 +961 @@
-  "Fill the article.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -788 +969 @@
-  "Hide cited text.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -795 +977 @@
-  "Hide cited text.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -802 +985 @@
-  "Strip list identifiers from `gnus-list-identifiers`.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :version "21.1"
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
-
-
-
-
-
-
+
+
-
-(defcustom gnus-treat-strip-pem nil
-  "Strip PEM signatures.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -825 +1006 @@
-The banner to be stripped is specified in the `banner' group parameter.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -832 +1014 @@
-  "Highlight the headers.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-(put 'gnus-treat-highlight-headers 'highlight t)
@@ -840 +1023 @@
-  "Highlight cited text.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-(put 'gnus-treat-highlight-citation 'highlight t)
@@ -848 +1032 @@
-  "Display the Date in UT (GMT).
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -855 +1040 @@
-  "Display the Date in the local timezone.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-head-custom)
+
+(defcustom gnus-treat-date-english nil
+  "Display the Date in a format that can be read aloud in English.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :version "21.4"
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -862 +1057 @@
-  "Display the Date header in a way that says how much time has elapsed.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -869 +1065 @@
-  "Display the date in the original timezone.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -876 +1073 @@
-  "Display the date in the ISO8601 format.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :version "21.1"
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -885 +1083 @@
-The format is defined by the `gnus-article-time-format' variable.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-head-custom)
-
@@ -892 +1091 @@
-  "Strip the X-No-Archive header line from the beginning of the body.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :version "21.1"
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -900 +1100 @@
-  "Strip trailing blank lines.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -907 +1108 @@
-  "Strip leading blank lines.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
@@ -914 +1116 @@
-  "Strip multiple blank lines.
-Valid values are nil, t, `head', `last', an integer or a predicate.
-the manual
+Info node `(gnus)Customizing Articles'
-  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-unfold-headers 'head
+  "Unfold folded header lines.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-fold-headers nil
+  "Fold headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :version "21.4"
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
+  :type gnus-article-treat-custom)
+
+(defcustom gnus-treat-fold-newsgroups 'head
+  "Fold the Newsgroups and Followup-To headers.
+Valid values are nil, t, `head', `last', an integer or a predicate.
+See Info node `(gnus)Customizing Articles' for details."
+  :version "21.4"
+  :group 'gnus-article-treat
+  :link '(custom-manual "(gnus)Customizing Articles")
-