Mercurial > emacs
changeset 73528:732eee78a670
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 156-159)
- Merge from emacs--devo--0
- Update from CVS
2006-10-29 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-set-mode-line): Quote % in group name.
2006-10-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-agent.el (gnus-agent-make-mode-line-string): Make it compatible
with Emacs 21 and XEmacs.
2006-10-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-view.el: Add interactive arg to html2text autoload.
2006-10-25 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-summary-move-article): Use no-encode for `B B'.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-487
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 29 Oct 2006 07:36:46 +0000 |
| parents | 3a457f633344 |
| children | 59b2832e02ef |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-agent.el lisp/gnus/gnus-sum.el lisp/gnus/mm-view.el |
| diffstat | 4 files changed, 36 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sat Oct 28 23:22:07 2006 +0000 +++ b/lisp/gnus/ChangeLog Sun Oct 29 07:36:46 2006 +0000 @@ -1,3 +1,20 @@ +2006-10-29 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-sum.el (gnus-set-mode-line): Quote % in group name. + +2006-10-28 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-agent.el (gnus-agent-make-mode-line-string): Make it compatible + with Emacs 21 and XEmacs. + +2006-10-26 Reiner Steib <Reiner.Steib@gmx.de> + + * mm-view.el: Add interactive arg to html2text autoload. + +2006-10-25 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-sum.el (gnus-summary-move-article): Use no-encode for `B B'. + 2006-10-20 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-group.el (gnus-group-make-doc-group): Work for non-ASCII group @@ -12,6 +29,7 @@ 2006-10-19 Reiner Steib <Reiner.Steib@gmx.de> * gnus.el (gnus-mime): Remove unused custom group. + (gnus-getenv-nntpserver, gnus-select-method): Autoload. 2006-10-13 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
--- a/lisp/gnus/gnus-agent.el Sat Oct 28 23:22:07 2006 +0000 +++ b/lisp/gnus/gnus-agent.el Sun Oct 29 07:36:46 2006 +0000 @@ -577,7 +577,17 @@ (fboundp 'make-mode-line-mouse-map)) (propertize string 'local-map (make-mode-line-mouse-map mouse-button mouse-func) - 'mouse-face 'mode-line-highlight) + 'mouse-face + (cond ((and (featurep 'xemacs) + ;; XEmacs' `facep' only checks for a face + ;; object, not for a face name, so it's useless + ;; to check with `facep'. + (find-face 'modeline)) + 'modeline) + ((facep 'mode-line-highlight) ;; Emacs 22 + 'mode-line-highlight) + ((facep 'mode-line) ;; Emacs 21 + 'mode-line)) ) string)) (defun gnus-agent-toggle-plugged (set-to)
--- a/lisp/gnus/gnus-sum.el Sat Oct 28 23:22:07 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Sun Oct 29 07:36:46 2006 +0000 @@ -5711,8 +5711,9 @@ (let* ((mformat (symbol-value (intern (format "gnus-%s-mode-line-format-spec" where)))) - (gnus-tmp-group-name (gnus-group-decoded-name - gnus-newsgroup-name)) + (gnus-tmp-group-name (gnus-mode-string-quote + (gnus-group-decoded-name + gnus-newsgroup-name))) (gnus-tmp-article-number (or gnus-current-article 0)) (gnus-tmp-unread gnus-newsgroup-unreads) (gnus-tmp-unread-and-unticked (length gnus-newsgroup-unreads)) @@ -9153,7 +9154,7 @@ (gnus-request-article-this-buffer article gnus-newsgroup-name) (when (consp (setq art-group (gnus-request-accept-article - to-newsgroup select-method (not articles)))) + to-newsgroup select-method (not articles) t))) (setq new-xref (concat new-xref " " (car art-group) ":" (number-to-string (cdr art-group)))) @@ -9161,7 +9162,7 @@ ;; it and replace the new article. (nnheader-replace-header "Xref" new-xref) (gnus-request-replace-article - (cdr art-group) to-newsgroup (current-buffer)) + (cdr art-group) to-newsgroup (current-buffer) t) art-group)))))) (cond ((not art-group) @@ -9259,7 +9260,7 @@ (gnus-request-article-this-buffer article gnus-newsgroup-name) (nnheader-replace-header "Xref" new-xref) (gnus-request-replace-article - article gnus-newsgroup-name (current-buffer)))) + article gnus-newsgroup-name (current-buffer) t))) ;; run the move/copy/crosspost/respool hook (run-hook-with-args 'gnus-summary-article-move-hook
--- a/lisp/gnus/mm-view.el Sat Oct 28 23:22:07 2006 +0000 +++ b/lisp/gnus/mm-view.el Sun Oct 29 07:36:46 2006 +0000 @@ -36,7 +36,7 @@ (autoload 'vcard-parse-string "vcard") (autoload 'vcard-format-string "vcard") (autoload 'fill-flowed "flow-fill") - (autoload 'html2text "html2text") + (autoload 'html2text "html2text" nil t) (unless (fboundp 'diff-mode) (autoload 'diff-mode "diff-mode" "" t nil)))