# HG changeset patch # User Miles Bader # Date 1128049433 0 # Node ID 8e46fef0174c5435878e1133e5c6a028af7c7464 # Parent d357f21fff0ed207128e42444932b142a7462a72 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 128) - Update from CVS 2005-09-28 Simon Josefsson * etc/GNUS-NEWS: Fix IDNA notes. 2005-09-28 Reiner Steib * lisp/gnus/message.el: Remove useless autoloads. 2005-09-28 Simon Josefsson * lisp/gnus/message.el (message-use-idna): Default to t. (message-use-idna): Test whether encoding works too. Doc fix. 2005-09-28 Katsumi Yamaoka * lisp/gnus/nntp.el (nntp-warn-about-losing-connection): Remove. 2005-09-28 Simon Josefsson * man/message.texi (IDNA): Fix. 2005-09-28 Katsumi Yamaoka * man/gnus.texi (NNTP): Remove nntp-buggy-select, nntp-read-timeout, nntp-server-hook, and nntp-warn-about-losing-connection; fix description of nntp-open-connection-function. (Common Variables): Fix descriptions. diff -r d357f21fff0e -r 8e46fef0174c etc/ChangeLog --- a/etc/ChangeLog Thu Sep 29 23:41:36 2005 +0000 +++ b/etc/ChangeLog Fri Sep 30 03:03:53 2005 +0000 @@ -1,3 +1,7 @@ +2005-09-28 Simon Josefsson + + * GNUS-NEWS: Fix IDNA notes. + 2005-09-27 Jay Belanger * calccard.tex: Update `versionnumber', remove `versiondate'. diff -r d357f21fff0e -r 8e46fef0174c etc/GNUS-NEWS --- a/etc/GNUS-NEWS Thu Sep 29 23:41:36 2005 +0000 +++ b/etc/GNUS-NEWS Fri Sep 30 03:03:53 2005 +0000 @@ -142,10 +142,10 @@ ** Support for non-ASCII domain names Message supports non-ASCII domain names in From:, To: and Cc: and will -query you whether to perform encoding when you try to send a message. -The variable `message-use-idna' controls this. Gnus will also decode -non-ASCII domain names in From:, To: and Cc: when you view a message. -The variable `gnus-use-idna' controls this. +encode them when you try to send a message. The variable +`message-use-idna' controls this. Gnus will also decode non-ASCII +domain names in From:, To: and Cc: when you view a message. The +variable `gnus-use-idna' controls this. ** Better handling of Microsoft citation styles diff -r d357f21fff0e -r 8e46fef0174c lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Thu Sep 29 23:41:36 2005 +0000 +++ b/lisp/gnus/ChangeLog Fri Sep 30 03:03:53 2005 +0000 @@ -1,3 +1,16 @@ +2005-09-28 Reiner Steib + + * message.el: Remove useless autoloads. + +2005-09-28 Simon Josefsson + + * message.el (message-use-idna): Default to t. + (message-use-idna): Test whether encoding works too. Doc fix. + +2005-09-28 Katsumi Yamaoka + + * nntp.el (nntp-warn-about-losing-connection): Remove. + 2005-09-27 Reiner Steib * mm-uu.el (mm-uu-emacs-sources-regexp): Make variable diff -r d357f21fff0e -r 8e46fef0174c lisp/gnus/message.el --- a/lisp/gnus/message.el Thu Sep 29 23:41:36 2005 +0000 +++ b/lisp/gnus/message.el Fri Sep 30 03:03:53 2005 +0000 @@ -1454,8 +1454,13 @@ (file-error)) (mm-coding-system-p 'utf-8) (executable-find idna-program) - 'ask) - "Whether to encode non-ASCII in domain names into ASCII according to IDNA." + (string= (idna-to-ascii "räksmörgås") + "xn--rksmrgs-5wao1o") + t) + "Whether to encode non-ASCII in domain names into ASCII according to IDNA. +GNU Libidn, and in particular the elisp package \"idna.el\" and +the external program \"idn\", must be installed for this +functionality to work." :version "22.1" :group 'message-headers :link '(custom-manual "(message)IDNA") @@ -1807,7 +1812,6 @@ ;;; Suggested by Jonas Steverud @ www.dtek.chalmers.se/~d4jonas/ -;;;###autoload (defun message-change-subject (new-subject) "Ask for NEW-SUBJECT header, append (was: )." ;; @@ -1839,7 +1843,6 @@ " (was: " old-subject ")\n"))))))))) -;;;###autoload (defun message-mark-inserted-region (beg end) "Mark some region in the current article with enclosing tags. See `message-mark-insert-begin' and `message-mark-insert-end'." @@ -1851,7 +1854,6 @@ (goto-char beg) (insert message-mark-insert-begin))) -;;;###autoload (defun message-mark-insert-file (file) "Insert FILE at point, marking it with enclosing tags. See `message-mark-insert-begin' and `message-mark-insert-end'." @@ -1864,7 +1866,6 @@ (goto-char p) (insert message-mark-insert-begin))) -;;;###autoload (defun message-add-archive-header () "Insert \"X-No-Archive: Yes\" in the header and a note in the body. The note can be customized using `message-archive-note'. When called with a @@ -1884,7 +1885,6 @@ (message-add-header message-archive-header) (message-sort-headers))) -;;;###autoload (defun message-cross-post-followup-to-header (target-group) "Mangles FollowUp-To and Newsgroups header to point to TARGET-GROUP. With prefix-argument just set Follow-Up, don't cross-post." @@ -1928,7 +1928,6 @@ (insert (concat "\nFollowup-To: " target-group))) (setq message-cross-post-old-target target-group)) -;;;###autoload (defun message-cross-post-insert-note (target-group cross-post in-old old-groups) "Insert a in message body note about a set Followup or Crosspost. @@ -1961,7 +1960,6 @@ (insert (concat message-followup-to-note target-group "\n")) (insert (concat message-cross-post-note target-group "\n"))))) -;;;###autoload (defun message-cross-post-followup-to (target-group) "Crossposts message and set Followup-To to TARGET-GROUP. With prefix-argument just set Follow-Up, don't cross-post." @@ -2003,7 +2001,6 @@ ;;; Reduce To: to Cc: or Bcc: header -;;;###autoload (defun message-reduce-to-to-cc () "Replace contents of To: header with contents of Cc: or Bcc: header." (interactive) diff -r d357f21fff0e -r 8e46fef0174c lisp/gnus/nntp.el --- a/lisp/gnus/nntp.el Thu Sep 29 23:41:36 2005 +0000 +++ b/lisp/gnus/nntp.el Fri Sep 30 03:03:53 2005 +0000 @@ -177,9 +177,6 @@ server there that you can connect to. See also `nntp-open-connection-function'") -(defvoo nntp-warn-about-losing-connection t - "*If non-nil, beep when a server closes connection.") - (defvoo nntp-coding-system-for-read 'binary "*Coding system to read from NNTP.") diff -r d357f21fff0e -r 8e46fef0174c man/ChangeLog --- a/man/ChangeLog Thu Sep 29 23:41:36 2005 +0000 +++ b/man/ChangeLog Fri Sep 30 03:03:53 2005 +0000 @@ -1,3 +1,14 @@ +2005-09-28 Simon Josefsson + + * message.texi (IDNA): Fix. + +2005-09-28 Katsumi Yamaoka + + * gnus.texi (NNTP): Remove nntp-buggy-select, nntp-read-timeout, + nntp-server-hook, and nntp-warn-about-losing-connection; fix + description of nntp-open-connection-function. + (Common Variables): Fix descriptions. + 2005-09-26 Katsumi Yamaoka * gnus.texi (Server Buffer Format): Document the %a format spec. diff -r d357f21fff0e -r 8e46fef0174c man/gnus.texi --- a/man/gnus.texi Thu Sep 29 23:41:36 2005 +0000 +++ b/man/gnus.texi Fri Sep 30 03:03:53 2005 +0000 @@ -12680,35 +12680,6 @@ connection before giving up. If it is @code{nil}, which is the default, no timeouts are done. -@c @item nntp-command-timeout -@c @vindex nntp-command-timeout -@c @cindex PPP connections -@c @cindex dynamic IP addresses -@c If you're running Gnus on a machine that has a dynamically assigned -@c address, Gnus may become confused. If the address of your machine -@c changes after connecting to the @acronym{NNTP} server, Gnus will simply sit -@c waiting forever for replies from the server. To help with this -@c unfortunate problem, you can set this command to a number. Gnus will -@c then, if it sits waiting for a reply from the server longer than that -@c number of seconds, shut down the connection, start a new one, and resend -@c the command. This should hopefully be transparent to the user. A -@c likely number is 30 seconds. -@c -@c @item nntp-retry-on-break -@c @vindex nntp-retry-on-break -@c If this variable is non-@code{nil}, you can also @kbd{C-g} if Gnus -@c hangs. This will have much the same effect as the command timeout -@c described above. - -@item nntp-server-hook -@vindex nntp-server-hook -This hook is run as the last step when connecting to an @acronym{NNTP} -server. - -@item nntp-buggy-select -@vindex nntp-buggy-select -Set this to non-@code{nil} if your select routine is buggy. - @item nntp-nov-is-evil @vindex nntp-nov-is-evil If the @acronym{NNTP} server does not support @acronym{NOV}, you could set this @@ -12740,11 +12711,6 @@ @vindex nntp-prepare-server-hook A hook run before attempting to connect to an @acronym{NNTP} server. -@item nntp-warn-about-losing-connection -@vindex nntp-warn-about-losing-connection -If this variable is non-@code{nil}, some noise will be made when a -server closes connection. - @item nntp-record-commands @vindex nntp-record-commands If non-@code{nil}, @code{nntp} will log all commands it sends to the @@ -12757,8 +12723,8 @@ It is possible to customize how the connection to the nntp server will be opened. If you specify an @code{nntp-open-connection-function} parameter, Gnus will use that function to establish the connection. -Five pre-made functions are supplied. These functions can be grouped in -two categories: direct connection functions (three pre-made), and +Six pre-made functions are supplied. These functions can be grouped in +two categories: direct connection functions (four pre-made), and indirect ones (two pre-made). @item nntp-prepare-post-hook @@ -12776,14 +12742,6 @@ Note that not all servers support the recommended ID. This works for INN versions 2.3.0 and later, for instance. -@item nntp-read-timeout -@vindex nntp-read-timeout -How long nntp should wait between checking for the end of output. -Shorter values mean quicker response, but is more CPU intensive. The -default is 0.1 seconds. If you have a slow line to the server (and -don't like to see Emacs eat your available CPU power), you might set -this to, say, 1. - @end table @menu @@ -12958,7 +12916,9 @@ The following variables affect the behavior of all, or several of the pre-made connection functions. When not specified, all functions are -affected. +affected (the values of the following variables will be used as the +default if each virtual @code{nntp} server doesn't specify those server +variables individually). @table @code @@ -12966,7 +12926,7 @@ @vindex nntp-pre-command A command wrapper to use when connecting through a non native connection function (all except @code{nntp-open-network-stream}, -@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}. This is +@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}). This is where you would put a @samp{SOCKS} wrapper for instance. @item nntp-address @@ -12977,7 +12937,7 @@ @vindex nntp-port-number Port number to connect to the @acronym{NNTP} server. The default is @samp{nntp}. If you use @acronym{NNTP} over -@acronym{tls}/@acronym{ssl}, you may want to use integer ports rather +@acronym{TLS}/@acronym{SSL}, you may want to use integer ports rather than named ports (i.e, use @samp{563} instead of @samp{snews} or @samp{nntps}), because external @acronym{TLS}/@acronym{SSL} tools may not work with named ports. diff -r d357f21fff0e -r 8e46fef0174c man/message.texi --- a/man/message.texi Thu Sep 29 23:41:36 2005 +0000 +++ b/man/message.texi Fri Sep 30 03:03:53 2005 +0000 @@ -839,13 +839,14 @@ The @code{message-use-idna} variable control whether @acronym{IDNA} is used. If the variable is @code{nil} no @acronym{IDNA} encoding will ever happen, if it is set to the symbol @code{ask} the user will be -queried (the default), and if set to @code{t} @acronym{IDNA} encoding -happens automatically. +queried, and if set to @code{t} @acronym{IDNA} encoding happens +automatically (the default). @findex message-idna-to-ascii-rhs If you want to experiment with the @acronym{IDNA} encoding, you can invoke @kbd{M-x message-idna-to-ascii-rhs RET} in the message buffer -to have the non-@acronym{ASCII} domain names encoded while you edit the message. +to have the non-@acronym{ASCII} domain names encoded while you edit +the message. Note that you must have @uref{http://www.gnu.org/software/libidn/, GNU Libidn} installed in order to use this functionality.