From: Miles Bader Date: Tue, 11 Apr 2006 23:22:06 +0000 (+0000) Subject: Revision: emacs@sv.gnu.org/emacs--devo--0--patch-210 X-Git-Tag: emacs-pretest-22.0.90~3206 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14e6dc54f295e1fbc92f6e22a5bb8b5f9a4b83ac;p=emacs.git Revision: emacs@sv.gnu.org/emacs--devo--0--patch-210 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 81-82) - Update from CVS --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0e077ce0b04..087cdf14503 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,35 @@ +2006-04-11 Reiner Steib + + * gnus-art.el (gnus-button-valid-localpart-regexp): Exclude `@'. + +2006-04-11 Arne J,Ax(Brgensen + + * gnus-sieve.el (gnus-sieve-generate): Delete from the start of + the sieve region. + +2006-04-11 Reiner Steib + + * gnus.el: Gnus v5.10.8 is released. + +2006-04-11 Lars Magne Ingebrigtsen + + * nnslashdot.el (nnslashdot-retrieve-headers-1): Fix up to new + layout. + + * rfc2047.el (rfc2047-decode-encoded-words): Don't message about + unknown charset. + + * message.el (message-header-synonyms): Add Original-To to the + default. + + * gnus-sum.el (gnus-get-newsgroup-headers-xover): group is an + optional parameter. + +2006-04-07 Reiner Steib + + * pgg-gpg.el: Revert to revision 7.15 to allow the use of + gpg-agent. + 2006-04-06 Reiner Steib * gnus-fun.el (gnus): Require it for gnus-directory. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 69fe8159c10..eed793d23ba 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -5972,7 +5972,7 @@ groups." ;; Regexp suggested by Felix Wiemann in <87oeuomcz9.fsf@news2.ososo.de> (defcustom gnus-button-valid-localpart-regexp - "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t ]*" + "[a-z0-9$%(*-=?[_][^<>\")!;:,{}\n\t @]*" "Regular expression that matches a localpart of mail addresses or MIDs." :version "22.1" :group 'gnus-article-buttons diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el index 99e8f6b4986..0e6c500d0f2 100644 --- a/lisp/gnus/gnus-sieve.el +++ b/lisp/gnus/gnus-sieve.el @@ -107,7 +107,7 @@ See the documentation for these variables and functions for details." (find-file gnus-sieve-file) (goto-char (point-min)) (if (re-search-forward (regexp-quote gnus-sieve-region-start) nil t) - (delete-region (match-end 0) + (delete-region (match-beginning 0) (or (re-search-forward (regexp-quote gnus-sieve-region-end) nil t) (point))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 4fc01a8fad3..bea7cb2445e 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -5962,7 +5962,8 @@ Return a list of headers that match SEQUENCE (see (allp (cond ((eq gnus-read-all-available-headers t) t) - ((stringp gnus-read-all-available-headers) + ((and (stringp gnus-read-all-available-headers) + group) (string-match gnus-read-all-available-headers group)) (t nil))) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 236ec1bc23f..741b193f779 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2749,7 +2749,8 @@ prefix FORCE is given." (message-carefully-insert-headers headers))) (defcustom message-header-synonyms - '((To Cc Bcc)) + '((To Cc Bcc) + (Original-To)) "List of lists of header synonyms. E.g., if this list contains a member list with elements `Cc' and `To', then `message-carefully-insert-headers' will not insert a `To' header diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el index 38468d7d194..66ce4d54472 100644 --- a/lisp/gnus/nnslashdot.el +++ b/lisp/gnus/nnslashdot.el @@ -142,7 +142,7 @@ (setq article (if (and article (< start article)) article start)) (goto-char point) (while (re-search-forward - "\\([^<]+\\).*\n.*score:\\([^)]+\\))" + "\\([^<]+\\).*\n.*\n.*score:\\([^)]+\\))" nil t) (setq cid (match-string 1) subject (match-string 2) diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index c89528a30db..aa30d9ba783 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -851,11 +851,8 @@ ENCODED-WORD)." (let (word charset cs encoding text rest) (while words (setq word (pop words)) - (if (and (or (setq cs (rfc2047-charset-to-coding-system - (setq charset (car word)))) - (progn - (message "Unknown charset: %s" charset) - nil)) + (if (and (setq cs (rfc2047-charset-to-coding-system + (setq charset (car word)))) (condition-case code (cond ((char-equal ?B (nth 1 word)) (setq text (base64-decode-string diff --git a/man/ChangeLog b/man/ChangeLog index e5f77c35059..37543f5d8da 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,12 @@ +2006-04-11 Reiner Steib + + * gnus.texi, gnus-faq.texi, message.texi: Gnus v5.10.8 is released. + +2006-04-10 Reiner Steib + + * gnus.texi (Misc Group Stuff, Summary Buffer, Article Keymap) + (Server Commands): Key `v' is reserved for users. + 2006-04-11 J.D. Smith * files.texi (Old Versions): Update description of vc-annotate's diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi index 7fa00c37403..a85a36c2d22 100644 --- a/man/gnus-faq.texi +++ b/man/gnus-faq.texi @@ -128,7 +128,7 @@ What is the latest version of Gnus? Jingle please: Gnus 5.10 is released, get it while it's hot! As well as the step in version number is rather small, Gnus 5.10 has tons of new features which you -shouldn't miss. The current release (5.10.6) should be at +shouldn't miss. The current release (5.10.8) should be at least as stable as the latest release of the 5.8 series. @node [1.2] diff --git a/man/gnus.texi b/man/gnus.texi index 6493911afcf..c5857f40ab4 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -4043,6 +4043,22 @@ happens. You just have to be careful if you do stuff like that. @table @kbd +@item v +@kindex v (Group) +@cindex keys, reserved for users (Group) +The key @kbd{v} is reserved for users. You can bind it key to some +function or better use it as a prefix key. For example: + +@lisp +(define-key gnus-group-mode-map (kbd "v j d") + (lambda () + (interactive) + (gnus-group-jump-to-group "nndraft:drafts"))) +@end lisp + +On keys reserved for users in Emacs and on keybindings in general +@xref{Keymaps, Keymaps, , emacs, The Emacs Editor}. + @item ^ @kindex ^ (Group) @findex gnus-group-enter-server-mode @@ -4438,6 +4454,14 @@ group buffer (@pxref{Selecting a Group}). You can have as many summary buffers open as you wish. +@kindex v (Summary) +@cindex keys, reserved for users (Summary) +The key @kbd{v} is reserved for users. You can bind it key to some +function or better use it as a prefix key. For example: +@lisp +(define-key gnus-summary-mode-map (kbd "v -") "LrS") ;; lower subthread +@end lisp + @menu * Summary Buffer Format:: Deciding how the summary buffer is to look. * Summary Maneuvering:: Moving around the summary buffer. @@ -11242,6 +11266,11 @@ buffer, which means that you don't actually have to have a summary buffer displayed while reading. You can do it all from the article buffer. +@kindex v (Article) +@cindex keys, reserved for users (Article) +The key @kbd{v} is reserved for users. You can bind it key to some +function or better use it as a prefix key. + A few additional keystrokes are available: @table @kbd @@ -12272,6 +12301,12 @@ Also @pxref{Formatting Variables}. @table @kbd +@item v +@kindex v (Server) +@cindex keys, reserved for users (Server) +The key @kbd{v} is reserved for users. You can bind it key to some +function or better use it as a prefix key. + @item a @kindex a (Server) @findex gnus-server-add-server