diff options
| author | Miles Bader <miles@gnu.org> | 2005-07-14 05:45:24 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-07-14 05:45:24 +0000 |
| commit | ead25b5cabbe092711864eae13a76437e6a65ce1 (patch) | |
| tree | 17a011aa448566a30e9ed4e032896fc22da460c1 | |
| parent | 774784f6bef1e3ff998ee2464ab37b4f84eac09a (diff) | |
| download | emacs-ead25b5cabbe092711864eae13a76437e6a65ce1.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-484
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
2005-07-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-salt.el (gnus-pick-mode): Remove the 5th arg of
gnus-add-minor-mode.
(gnus-binary-mode): Ditto.
* lisp/gnus/gnus-topic.el (gnus-topic-mode): Ditto.
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus-salt.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus-topic.el | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e944bd6fb60..7298fb92d69 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2005-07-13 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-salt.el (gnus-pick-mode): Remove the 5th arg of + gnus-add-minor-mode. + (gnus-binary-mode): Ditto. + + * gnus-topic.el (gnus-topic-mode): Ditto. + 2005-07-08 Ralf Angeli <angeli@iwi.uni-sb.de> (tiny change) * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1) diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el index 8fbe465c76c..c8c0f30b417 100644 --- a/lisp/gnus/gnus-salt.el +++ b/lisp/gnus/gnus-salt.el @@ -128,8 +128,7 @@ It accepts the same format specs that `gnus-summary-line-format' does." ;; Set up the menu. (when (gnus-visual-p 'pick-menu 'menu) (gnus-pick-make-menu-bar)) - (gnus-add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map - nil 'gnus-pick-mode) + (gnus-add-minor-mode 'gnus-pick-mode " Pick" gnus-pick-mode-map) (gnus-run-hooks 'gnus-pick-mode-hook)))) (defun gnus-pick-setup-message () @@ -362,8 +361,7 @@ This must be bound to a button-down mouse event." ;; Set up the menu. (when (gnus-visual-p 'binary-menu 'menu) (gnus-binary-make-menu-bar)) - (gnus-add-minor-mode 'gnus-binary-mode " Binary" - gnus-binary-mode-map nil 'gnus-binary-mode) + (gnus-add-minor-mode 'gnus-binary-mode " Binary" gnus-binary-mode-map) (gnus-run-hooks 'gnus-binary-mode-hook)))) (defun gnus-binary-display-article (article &optional all-header) diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index 95a2e1ad56a..3b2bfacddb0 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -1,6 +1,6 @@ ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2005 Free Software Foundation, Inc. ;; Author: Ilja Weis <kult@uni-paderborn.de> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -1136,10 +1136,7 @@ articles in the topic and its subtopics." (when (gnus-visual-p 'topic-menu 'menu) (gnus-topic-make-menu-bar)) (gnus-set-format 'topic t) - (gnus-add-minor-mode 'gnus-topic-mode " Topic" - gnus-topic-mode-map nil (lambda (&rest junk) - (interactive) - (gnus-topic-mode nil t))) + (gnus-add-minor-mode 'gnus-topic-mode " Topic" gnus-topic-mode-map) (add-hook 'gnus-group-catchup-group-hook 'gnus-topic-update-topic) (set (make-local-variable 'gnus-group-prepare-function) 'gnus-group-prepare-topics) |