[Emacs-diffs] trunk r116866: Merge from Gnus git master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 116866
revision-id: address@hidden
parent: address@hidden
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-23 23:16:06 +0000
message:
  Merge from Gnus git master
  
  2014-03-14 Katsumi Yamaoka <address@hidden>
   * gnus.texi (Ma Gnus): Mention header attachment buttons.
  
  2014-03-05 Lars Ingebrigtsen <address@hidden>
   * emacs-mime.texi (MML Definition): Document recipient-filename.
  
  2014-02-05 Katsumi Yamaoka <address@hidden>
   * gnus.texi (MIME Commands): Mention
   gnus-mime-buttonize-attachments-in-header and
   gnus-mime-display-attachment-buttons-in-header.
  
  2014-02-01 Lars Ingebrigtsen <address@hidden>
   * message.texi (Forwarding): Mention
   `message-forward-included-headers'.
  
  2014-01-31 Lars Ingebrigtsen <address@hidden>
   * gnus.texi: w3 is no longer supported by Gnus.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/emacs-mime.texi       
emacsmime.texi-20091113204419-o5vbwnq5f7feedwu-6297
  doc/misc/gnus-faq.texi         
gnusfaq.texi-20091113204419-o5vbwnq5f7feedwu-6304
  doc/misc/gnus.texi             gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
  doc/misc/message.texi          
message.texi-20091113204419-o5vbwnq5f7feedwu-6310

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-03-22 23:47:20 +0000
+++ b/doc/misc/ChangeLog        2014-03-23 23:16:06 +0000
@@ -1,3 +1,26 @@
+2014-03-23  Katsumi Yamaoka  <address@hidden>
+
+       * gnus.texi (Ma Gnus): Mention header attachment buttons.
+
+2014-03-23  Lars Ingebrigtsen  <address@hidden>
+
+       * emacs-mime.texi (MML Definition): Document recipient-filename.
+
+2014-03-23  Katsumi Yamaoka  <address@hidden>
+
+       * gnus.texi (MIME Commands): Mention
+       gnus-mime-buttonize-attachments-in-header and
+       gnus-mime-display-attachment-buttons-in-header.
+
+2014-03-23  Lars Ingebrigtsen  <address@hidden>
+
+       * message.texi (Forwarding): Mention
+       `message-forward-included-headers'.
+
+2014-03-23  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi: w3 is no longer supported by Gnus.
+
 2014-03-22  Glenn Morris  <address@hidden>
 
        * efaq.texi (Informational files for Emacs): Do not mention etc/GNU.

=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi  2014-01-24 03:57:53 +0000
+++ b/doc/misc/emacs-mime.texi  2014-03-23 23:16:06 +0000
@@ -405,7 +405,7 @@
 @item mm-text-html-renderer
 @vindex mm-text-html-renderer
 This selects the function used to render @acronym{HTML}.  The predefined
-renderers are selected by the symbols @code{gnus-article-html}, @code{w3},
+renderers are selected by the symbols @code{gnus-article-html},
 @address@hidden @uref{http://emacs-w3m.namazu.org/} for more
 information about emacs-w3m}, @code{links}, @code{lynx},
 @code{w3m-standalone} or @code{html2text}.  If @code{nil} use an
@@ -418,11 +418,11 @@
 @samp{<img>} tags.  It is likely to be intended to verify whether you
 have read the mail.  You can prevent your personal information from
 leaking by setting this option to @code{nil} (which is the default).
-It is currently ignored by Emacs/w3.  For emacs-w3m, you may use the
-command @kbd{t} on the image anchor to show an image even if it is
address@hidden@footnote{The command @kbd{T} will load all images.  If you
-have set the option @code{w3m-key-binding} to @code{info}, use @kbd{i}
-or @kbd{I} instead.}
+For emacs-w3m, you may use the command @kbd{t} on the image anchor to
+show an image even if it is @address@hidden command @kbd{T}
+will load all images.  If you have set the option
address@hidden to @code{info}, use @kbd{i} or @kbd{I}
+instead.}
 
 @item mm-w3m-safe-url-regexp
 @vindex mm-w3m-safe-url-regexp
@@ -648,6 +648,12 @@
 Use the contents of the file in the body of the part
 (@code{Content-Disposition}).
 
address@hidden recipient-filename
+Use this as the file name in the generated @acronym{MIME} message for
+the recipient.  That is, even if the file is called @file{foo.txt}
+locally, use this name instead in the @code{Content-Disposition} in
+the sent message.
+
 @item charset
 The contents of the body of the part are to be encoded in the character
 set specified (@code{Content-Type}). @xref{Charset Translation}.

=== modified file 'doc/misc/gnus-faq.texi'
--- a/doc/misc/gnus-faq.texi    2014-01-06 05:25:46 +0000
+++ b/doc/misc/gnus-faq.texi    2014-03-23 23:16:06 +0000
@@ -723,7 +723,7 @@
                 the top of the article buffer?
 * FAQ 4-6::     I'd like Gnus NOT to render HTML-mails but show me the
                 text part if it's available. How to do it?
-* FAQ 4-7::     Can I use some other browser than w3 to render my
+* FAQ 4-7::     Can I use some other browser than shr to render my
                 HTML-mails?
 * FAQ 4-8::     Is there anything I can do to make poorly formatted
                 mails more readable?
@@ -868,12 +868,12 @@
 @node FAQ 4-7
 @subsubheading Question 4.7
 
-Can I use some other browser than w3 to render my HTML-mails?
+Can I use some other browser than w3m to render my HTML-mails?
 
 @subsubheading Answer
 
 Only if you use Gnus 5.10 or younger. In this case you've got the
-choice between w3, w3m, links, lynx and html2text, which
+choice between shr, w3m, links, lynx and html2text, which
 one is used can be specified in the variable
 mm-text-html-renderer, so if you want links to render your
 mail say

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2014-03-12 20:52:34 +0000
+++ b/doc/misc/gnus.texi        2014-03-23 23:16:06 +0000
@@ -704,7 +704,6 @@
 * Archiving Mail::
 * Web Searches::                Creating groups from articles that match a 
string.
 * RSS::                         Reading RDF site summary.
-* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 
 Other Sources
 
@@ -9140,9 +9139,6 @@
 @item gnus-w3m
 Use Gnus rendered based on w3m.
 
address@hidden w3
-Use Emacs/W3.
-
 @item w3m
 Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
 
@@ -9805,6 +9801,19 @@
 mostly useful if you wish to save (or perform other actions) on inlined
 parts.
 
address@hidden W M h
address@hidden W M h (Summary)
address@hidden gnus-mime-buttonize-attachments-in-header
address@hidden gnus-mime-display-attachment-buttons-in-header
+Display @acronym{MIME} part buttons in the end of the header of an
+article (@code{gnus-mime-buttonize-attachments-in-header}).  This
+command toggles the display.  Note that buttons to be added to the
+header are only the ones that aren't inlined in the body.  If you want
+those buttons always to be displayed, set
address@hidden to address@hidden
+The default is @code{t}.  To change the appearance of buttons, customize
address@hidden
+
 @item K m
 @kindex K m (Summary)
 @findex gnus-summary-repair-multipart
@@ -16841,12 +16850,8 @@
 * Archiving Mail::
 * Web Searches::                Creating groups from articles that match a 
string.
 * RSS::                         Reading RDF site summary.
-* Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
 @end menu
 
-All the web sources require Emacs/W3 and the url library or those
-alternatives to work.
-
 The main caveat with all these web sources is that they probably won't
 work for a very long time.  Gleaning information from the @acronym{HTML} data
 is guesswork at best, and when the layout is altered, the Gnus back end
@@ -16922,10 +16927,6 @@
 community.  Since @code{nnweb} washes the ads off all the articles, one
 might think that the providers might be somewhat miffed.  We'll see.
 
-You must have the @code{url} and @code{W3} package or those alternatives
-(try @code{customize-group} on the @samp{mm-url} variable group)
-installed to be able to use @code{nnweb}.
-
 Virtual server variables:
 
 @table @code
@@ -17123,38 +17124,6 @@
 @end lisp
 
 
address@hidden Customizing W3
address@hidden Customizing W3
address@hidden W3
address@hidden html
address@hidden url
address@hidden Netscape
-
-Gnus uses the url library to fetch web pages and Emacs/W3 (or those
-alternatives) to display web pages.  Emacs/W3 is documented in its own
-manual, but there are some things that may be more relevant for Gnus
-users.
-
-For instance, a common question is how to make Emacs/W3 follow links
-using the @code{browse-url} functions (which will call some external web
-browser like Netscape).  Here's one way:
-
address@hidden
-(eval-after-load "w3"
-  '(progn
-    (fset 'w3-fetch-orig (symbol-function 'w3-fetch))
-    (defun w3-fetch (&optional url target)
-      (interactive (list (w3-read-url-with-default)))
-      (if (eq major-mode 'gnus-article-mode)
-          (browse-url url)
-        (w3-fetch-orig url target)))))
address@hidden lisp
-
-Put that in your @file{.emacs} file, and hitting links in W3-rendered
address@hidden in the Gnus article buffers will use @code{browse-url} to
-follow the link.
-
-
 @node Other Sources
 @section Other Sources
 
@@ -26338,7 +26307,7 @@
 whatever packages the Gnus XEmacs package requires.  The current
 requirements are @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
 @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
address@hidden, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{W3},
address@hidden, @samp{mh-e}, @samp{sieve}, @samp{ps-print},
 @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto}, and @samp{sasl}.
 
 
@@ -28415,6 +28384,19 @@
 
 @itemize @bullet
 
address@hidden Changes in summary and article mode
address@hidden **************************************
+
address@hidden @bullet
+
address@hidden
+By default, @acronym{MIME} part buttons for attachments (if any) will
+appear in the end of the article header in addition to the bottom of the
+article body, so you can easily find them without scrolling the article
+again and again.  @xref{MIME Commands}.
+
address@hidden itemize
+
 @item Changes in Message mode and related Gnus features
 @c ****************************************************
 

=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi     2014-03-12 20:52:34 +0000
+++ b/doc/misc/message.texi     2014-03-23 23:16:06 +0000
@@ -310,7 +310,13 @@
 @table @code
 @item message-forward-ignored-headers
 @vindex message-forward-ignored-headers
-All headers that match this regexp will be deleted when forwarding a message.
+In address@hidden, all headers that match this regexp will be deleted
+when forwarding a message.
+
address@hidden message-forward-included-headers
address@hidden message-forward-included-headers
+In address@hidden, only headers that match this regexp will be kept
+when forwarding a message.
 
 @item message-make-forward-subject-function
 @vindex message-make-forward-subject-function