1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 136)

   - Update from CVS

2006-09-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/pop3.el (pop3-leave-mail-on-server): Mention problem of duplicate
   mails in the doc string.  Add some URLs in comment.

2006-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings): Fix
   backslashes handling and the way to find boundaries of quoted strings.

2006-09-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi (Mail Source Specifiers): Mention problem of duplicate
   mails with pop3-leave-mail-on-server.  Fix wording.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-431
This commit is contained in:
Miles Bader 2006-09-11 14:45:20 +00:00
parent 4e963ca816
commit b110774acb
5 changed files with 54 additions and 32 deletions

View File

@ -1,3 +1,13 @@
2006-09-09 Reiner Steib <Reiner.Steib@gmx.de>
* pop3.el (pop3-leave-mail-on-server): Mention problem of duplicate
mails in the doc string. Add some URLs in comment.
2006-09-07 Katsumi Yamaoka <yamaoka@jpl.org>
* rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings): Fix
backslashes handling and the way to find boundaries of quoted strings.
2006-09-06 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-art.el (gnus-button-regexp, gnus-button-marker-list)

View File

@ -89,8 +89,12 @@ If the `pop3-leave-mail-on-server' is non-`nil' the mail is to be
left on the POP server after fetching. Note that POP servers
maintain no state information between sessions, so what the
client believes is there and what is actually there may not match
up. If they do not, then the whole thing can fall apart and
leave you with a corrupt mailbox."
up. If they do not, then you may get duplicate mails or the
whole thing can fall apart and leave you with a corrupt mailbox."
;; We can't use the UILD support from XEmacs mail-lib or cvs.m17n.org:
;; http://thread.gmane.org/v9lld8fml4.fsf@marauder.physik.uni-ulm.de
;; http://thread.gmane.org/b9yy8hzy9ej.fsf@jpl.org
;; Any volunteer to re-implement this?
:version "22.1" ;; Oort Gnus
:type 'boolean
:group 'pop3)

View File

@ -178,30 +178,32 @@ Quoting will not be done in a quoted string if it contains characters
matching ENCODABLE-REGEXP."
(goto-char (point-min))
(let ((tspecials (concat "[" ietf-drums-tspecials "]"))
beg)
beg end)
(with-syntax-table (standard-syntax-table)
(while (search-forward "\"" nil t)
(unless (eq (char-before) ?\\)
(setq beg (match-end 0))
(goto-char (match-beginning 0))
(setq beg (match-beginning 0))
(unless (eq (char-before beg) ?\\)
(goto-char beg)
(setq beg (1+ beg))
(condition-case nil
(progn
(forward-sexp)
(save-restriction
(narrow-to-region beg (1- (point)))
(goto-char beg)
(unless (and encodable-regexp
(re-search-forward encodable-regexp nil t))
(setq end (1- (point)))
(goto-char beg)
(if (and encodable-regexp
(re-search-forward encodable-regexp end t))
(goto-char (1+ end))
(save-restriction
(narrow-to-region beg end)
(while (re-search-forward tspecials nil 'move)
(unless (and (eq (char-before) ?\\) ;; Already quoted.
(looking-at tspecials))
(if (eq (char-before) ?\\)
(if (looking-at tspecials) ;; Already quoted.
(forward-char)
(insert "\\"))
(goto-char (match-beginning 0))
(unless (or (eq (char-before) ?\\)
(and rfc2047-encode-encoded-words
(eq (char-after) ??)
(eq (char-before) ?=)))
(insert "\\")))
(forward-char)))))
(insert "\\")
(forward-char))))
(forward-char)))
(error
(goto-char beg))))))))

View File

@ -1,3 +1,8 @@
2006-09-09 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Mail Source Specifiers): Mention problem of duplicate
mails with pop3-leave-mail-on-server. Fix wording.
2006-09-11 Simon Josefsson <jas@extundo.com>
* smtpmail.texi (Authentication): Explain TLS and SSL better, based on

View File

@ -6348,9 +6348,9 @@ articles younger than that number of days.
@item / n
@kindex / n (Summary)
@findex gnus-summary-limit-to-articles
Limit the summary buffer to the current article
(@code{gnus-summary-limit-to-articles}). Uses the process/prefix
convention (@pxref{Process/Prefix}).
With prefix @samp{n}, limit the summary buffer to the next @samp{n}
articles. If not given a prefix, use the process marked articles
instead. (@code{gnus-summary-limit-to-articles}).
@item / w
@kindex / w (Summary)
@ -13633,16 +13633,17 @@ and says what authentication scheme to use. The default is
@vindex pop3-movemail
@vindex pop3-leave-mail-on-server
If the @code{:program} and @code{:function} keywords aren't specified,
@code{pop3-movemail} will be used. If the
@code{pop3-leave-mail-on-server} is non-@code{nil} the mail is to be
left on the @acronym{POP} server after fetching when using
@code{pop3-movemail}. Note that POP servers maintain no state
information between sessions, so what the client believes is there and
what is actually there may not match up. If they do not, then the whole
thing can fall apart and leave you with a corrupt mailbox.
@code{pop3-movemail} will be used. If @code{pop3-leave-mail-on-server}
is non-@code{nil} the mail is to be left on the @acronym{POP} server
after fetching when using @code{pop3-movemail}. Note that POP servers
maintain no state information between sessions, so what the client
believes is there and what is actually there may not match up. If they
do not, then you may get duplicate mails or the whole thing can fall
apart and leave you with a corrupt mailbox.
Here are some examples. Fetch from the default @acronym{POP} server,
using the default user name, and default fetcher:
Here are some examples for getting mail from a @acronym{POP} server.
Fetch from the default @acronym{POP} server, using the default user
name, and default fetcher:
@lisp
(pop)
@ -22183,7 +22184,7 @@ The variable that controls this is the
@code{gnus-article-x-face-command} variable. If this variable is a
string, this string will be executed in a sub-shell. If it is a
function, this function will be called with the face as the argument.
If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
the @code{From} header, the face will not be shown.
(Note: @code{x-face} is used in the variable/function names, not