Mercurial > emacs
changeset 110243:d0ac153f6acf
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 02 Sep 2010 04:31:05 +0000 |
| parents | 2d39cc9376df (current diff) 19ce95f8bbbb (diff) |
| children | e801f2c8daf3 |
| files | |
| diffstat | 7 files changed, 62 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/ChangeLog Thu Sep 02 04:31:05 2010 +0000 @@ -1,3 +1,45 @@ +2010-09-02 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-html.el (gnus-article-html): Make work buffer multibyte for + decoded contents. + +2010-09-02 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * gnus-group.el (gnus-group-line-format): Remove %O (moderated) from + group line format, since it isn't very interesting. + + * gnus-agent.el (gnus-agent-short-article), + (gnus-agent-long-article): Increase values for these two variables, + since most people are likely to have more network connection and + storage than before. + + * gnus.el (gnus-refer-article-method): Change default to 'current. + When referring an article, the common behaviour is to refer it from the + current select method, not the native select method. The chances of + the native select method having the message in question is rather slim + these days. + + * gnus-sum.el (gnus-auto-select-subject): Change default to + `unseen-or-unread'. I think it's likely that most people want to + select an unseen article over a previously seen, but unread one. + + * gnus.el (gnus-mode-non-string-length): Change default to 30. nil + means that in the article buffer none of the minor mode elements will + be shown, usually, and this is not desirable in most cases. + + * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so + that commands like `d' (and the like) go to the next line in the + buffer, instead of the next unread article. I think this is the + behaviour that is most natural for most users. + (gnus-single-article-buffer): Change default to nil, so that people can + have as many article buffers open as they have summary buffer. I think + this is the most natural way for the groups to behave. + + * message.el (message-generate-new-buffers): Change default to + `unsent', so that all new message buffers start their names with the + string "*unsent", and it's easier to find the buffers if you move from + them. + 2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-html.el (gnus-html-wash-tags): Don't show images that are really
--- a/lisp/gnus/gnus-agent.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/gnus-agent.el Thu Sep 02 04:31:05 2010 +0000 @@ -2644,10 +2644,10 @@ (defvar gnus-agent-predicate 'false "The selection predicate used when no other source is available.") -(defvar gnus-agent-short-article 100 +(defvar gnus-agent-short-article 500 "Articles that have fewer lines than this are short.") -(defvar gnus-agent-long-article 200 +(defvar gnus-agent-long-article 1000 "Articles that have more lines than this are long.") (defvar gnus-agent-low-score 0
--- a/lisp/gnus/gnus-group.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/gnus-group.el Thu Sep 02 04:31:05 2010 +0000 @@ -169,7 +169,7 @@ (function-item gnus-group-sort-by-rank) (function :tag "other" nil)))) -(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)%O\n" +(defcustom gnus-group-line-format "%M\%S\%p\%P\%5y:%B%(%g%)\n" "*Format of group lines. It works along the same lines as a normal formatting string, with some simple extensions.
--- a/lisp/gnus/gnus-html.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/gnus-html.el Thu Sep 02 04:31:05 2010 +0000 @@ -82,7 +82,10 @@ (when (and charset (setq charset (mm-charset-to-coding-system charset)) (not (eq charset 'ascii))) - (mm-decode-coding-region (point-min) (point-max) charset)) + (insert (prog1 + (mm-decode-coding-string (buffer-string) charset) + (erase-buffer) + (mm-enable-multibyte)))) (call-process-region (point-min) (point-max) "w3m" nil article-buffer nil
--- a/lisp/gnus/gnus-sum.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/gnus-sum.el Thu Sep 02 04:31:05 2010 +0000 @@ -221,7 +221,7 @@ :group 'gnus-summary-format :type 'string) -(defcustom gnus-summary-goto-unread t +(defcustom gnus-summary-goto-unread nil "*If t, many commands will go to the next unread article. This applies to marking commands as well as other commands that \"naturally\" select the next article, like, for instance, `SPC' at @@ -231,6 +231,7 @@ \(they go to the next article instead). If `never', commands that usually go to the next unread article, will go to the next article, whether it is read or not." + :version "24.1" :group 'gnus-summary-marks :link '(custom-manual "(gnus)Setting Marks") :type '(choice (const :tag "off" nil) @@ -349,7 +350,7 @@ :type '(choice (const :tag "none" nil) (sexp :menu-tag "first" t))) -(defcustom gnus-auto-select-subject 'unread +(defcustom gnus-auto-select-subject 'unseen-or-unread "*Says what subject to place under point when entering a group. This variable can either be the symbols `first' (place point on the @@ -360,7 +361,7 @@ line of the first unseen article or, if all article have been seen, on the subject line of the first unread article), or a function to be called to place point on some subject line." - :version "22.1" + :version "24.1" :group 'gnus-group-select :type '(choice (const best) (const unread) @@ -464,9 +465,10 @@ :group 'gnus-summary :type 'boolean) -(defcustom gnus-single-article-buffer t +(defcustom gnus-single-article-buffer nil "*If non-nil, display all articles in the same buffer. If nil, each group will get its own article buffer." + :version "24.1" :group 'gnus-article-various :type 'boolean)
--- a/lisp/gnus/gnus.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/gnus.el Thu Sep 02 04:31:05 2010 +0000 @@ -1443,7 +1443,7 @@ ;; Customization variables -(defcustom gnus-refer-article-method nil +(defcustom gnus-refer-article-method 'current "Preferred method for fetching an article by Message-ID. If you are reading news from the local spool (with nnspool), fetching articles by Message-ID is painfully slow. By setting this method to an @@ -1455,6 +1455,7 @@ It can also be a list of select methods, as well as the special symbol `current', which means to use the current select method. If it is a list, Gnus will try all the methods in the list until it finds a match." + :version "24.1" :group 'gnus-server :type '(choice (const :tag "default" nil) (const current) @@ -1804,12 +1805,11 @@ (const summary) (const tree))) -;; Added by Keinonen Kari <kk85613@cs.tut.fi>. -(defcustom gnus-mode-non-string-length nil +(defcustom gnus-mode-non-string-length 30 "*Max length of mode-line non-string contents. If this is nil, Gnus will take space as is needed, leaving the rest -of the mode line intact. Note that the default of nil is unlikely -to be desirable; see the manual for further details." +of the mode line intact." + :version "24.1" :group 'gnus-various :type '(choice (const nil) integer))
--- a/lisp/gnus/message.el Thu Sep 02 02:12:28 2010 +0000 +++ b/lisp/gnus/message.el Thu Sep 02 04:31:05 2010 +0000 @@ -464,7 +464,7 @@ :link '(custom-manual "(message)Sending Variables") :type 'boolean) -(defcustom message-generate-new-buffers 'unique +(defcustom message-generate-new-buffers 'unsent "*Say whether to create a new message buffer to compose a message. Valid values include: @@ -487,6 +487,7 @@ If this is a function, call that function with three parameters: The type, the To address and the group name (any of these may be nil). The function should return the new buffer name." + :version "24.1" :group 'message-buffers :link '(custom-manual "(message)Message Buffers") :type '(choice (const nil)