projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnus-art.el (gnus-mm-display-part): Bugfix for the 2014-02-05 change
[gnus]
/
lisp
/
gnus-group.el
diff --git
a/lisp/gnus-group.el
b/lisp/gnus-group.el
index
9533f58
..
31078be
100644
(file)
--- a/
lisp/gnus-group.el
+++ b/
lisp/gnus-group.el
@@
-1,6
+1,6
@@
;;; gnus-group.el --- group mode commands for Gnus
;;; gnus-group.el --- group mode commands for Gnus
-;; Copyright (C) 1996-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 1996-201
4
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
@@
-24,10
+24,6
@@
;;; Code:
;;; Code:
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
- (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
(eval-when-compile
(require 'cl))
(defvar tool-bar-mode)
(eval-when-compile
(require 'cl))
(defvar tool-bar-mode)
@@
-571,7
+567,6
@@
simple manner.")
"p" gnus-group-prev-unread-group
"\177" gnus-group-prev-unread-group
[delete] gnus-group-prev-unread-group
"p" gnus-group-prev-unread-group
"\177" gnus-group-prev-unread-group
[delete] gnus-group-prev-unread-group
- [backspace] gnus-group-prev-unread-group
"N" gnus-group-next-group
"P" gnus-group-prev-group
"\M-n" gnus-group-next-unread-group-same-level
"N" gnus-group-next-group
"P" gnus-group-prev-group
"\M-n" gnus-group-next-unread-group-same-level
@@
-1105,7
+1100,7
@@
When FORCE, rebuild the tool bar."
(set (make-local-variable 'tool-bar-map) map))))
gnus-group-tool-bar-map)
(set (make-local-variable 'tool-bar-map) map))))
gnus-group-tool-bar-map)
-(def
un gnus-group-mode ()
+(def
ine-derived-mode gnus-group-mode fundamental-mode "Group"
"Major mode for reading news.
All normal editing commands are switched off.
"Major mode for reading news.
All normal editing commands are switched off.
@@
-1122,17
+1117,12
@@
For more in-depth information on this mode, read the manual (`\\[gnus-info-find-
The following commands are available:
\\{gnus-group-mode-map}"
The following commands are available:
\\{gnus-group-mode-map}"
- (interactive)
- (kill-all-local-variables)
(when (gnus-visual-p 'group-menu 'menu)
(gnus-group-make-menu-bar)
(gnus-group-make-tool-bar))
(gnus-simplify-mode-line)
(when (gnus-visual-p 'group-menu 'menu)
(gnus-group-make-menu-bar)
(gnus-group-make-tool-bar))
(gnus-simplify-mode-line)
- (setq major-mode 'gnus-group-mode)
- (setq mode-name "Group")
(gnus-group-set-mode-line)
(setq mode-line-process nil)
(gnus-group-set-mode-line)
(setq mode-line-process nil)
- (use-local-map gnus-group-mode-map)
(buffer-disable-undo)
(setq truncate-lines t)
(setq buffer-read-only t
(buffer-disable-undo)
(setq truncate-lines t)
(setq buffer-read-only t
@@
-1143,8
+1133,7
@@
The following commands are available:
(when gnus-use-undo
(gnus-undo-mode 1))
(when gnus-slave
(when gnus-use-undo
(gnus-undo-mode 1))
(when gnus-slave
- (gnus-slave-mode))
- (gnus-run-mode-hooks 'gnus-group-mode-hook))
+ (gnus-slave-mode)))
(defun gnus-update-group-mark-positions ()
(save-excursion
(defun gnus-update-group-mark-positions ()
(save-excursion
@@
-1193,7
+1182,7
@@
The following commands are available:
(defun gnus-group-setup-buffer ()
(set-buffer (gnus-get-buffer-create gnus-group-buffer))
(defun gnus-group-setup-buffer ()
(set-buffer (gnus-get-buffer-create gnus-group-buffer))
- (unless (
eq major-mode
'gnus-group-mode)
+ (unless (
derived-mode-p
'gnus-group-mode)
(gnus-group-mode)))
(defun gnus-group-name-charset (method group)
(gnus-group-mode)))
(defun gnus-group-name-charset (method group)
@@
-2147,7
+2136,7
@@
be permanent."
(defun gnus-group-name-at-point ()
"Return a group name from around point if it exists, or nil."
(defun gnus-group-name-at-point ()
"Return a group name from around point if it exists, or nil."
- (if (
eq major-mode
'gnus-group-mode)
+ (if (
derived-mode-p
'gnus-group-mode)
(let ((group (gnus-group-group-name)))
(when group
(gnus-group-decoded-name group)))
(let ((group (gnus-group-group-name)))
(when group
(gnus-group-decoded-name group)))
@@
-2735,7
+2724,7
@@
server."
(interactive
(list
(gnus-read-group "Group name: ")
(interactive
(list
(gnus-read-group "Group name: ")
- (gnus-read-method "
From method
")))
+ (gnus-read-method "
Select method for new group (use tab for completion)
")))
(when (stringp method)
(setq method (or (gnus-server-to-method method) method)))
(when (stringp method)
(setq method (or (gnus-server-to-method method) method)))
@@
-3114,7
+3103,7
@@
If SOLID (the prefix), create a solid group."
(gnus-group-read-ephemeral-group
group method t
(cons (current-buffer)
(gnus-group-read-ephemeral-group
group method t
(cons (current-buffer)
- (if (
eq major-mode
'gnus-summary-mode) 'summary 'group))))))
+ (if (
derived-mode-p
'gnus-summary-mode) 'summary 'group))))))
(defvar nnrss-group-alist)
(eval-when-compile
(defvar nnrss-group-alist)
(eval-when-compile
@@
-3229,7
+3218,7
@@
mail messages or news articles in files that have numeric names."
(unless (gnus-group-read-ephemeral-group
name method t
(cons (current-buffer)
(unless (gnus-group-read-ephemeral-group
name method t
(cons (current-buffer)
- (if (
eq major-mode
'gnus-summary-mode)
+ (if (
derived-mode-p
'gnus-summary-mode)
'summary 'group)))
(error "Couldn't enter %s" dir))))
'summary 'group)))
(error "Couldn't enter %s" dir))))
@@
-4319,7
+4308,7
@@
The hook `gnus-suspend-gnus-hook' is called before actually suspending."
(unless (or (eq buf group-buf)
(eq buf gnus-dribble-buffer)
(with-current-buffer buf
(unless (or (eq buf group-buf)
(eq buf gnus-dribble-buffer)
(with-current-buffer buf
- (
eq major-mode
'message-mode)))
+ (
derived-mode-p
'message-mode)))
(gnus-kill-buffer buf)))
(setq gnus-backlog-articles nil)
(gnus-kill-gnus-frames)
(gnus-kill-buffer buf)))
(setq gnus-backlog-articles nil)
(gnus-kill-gnus-frames)
@@
-4404,7
+4393,12
@@
and the second element is the address."
;; Suggested by mapjph@bath.ac.uk.
(gnus-completing-read
"Address"
;; Suggested by mapjph@bath.ac.uk.
(gnus-completing-read
"Address"
- gnus-secondary-servers))
+ ;; FIXME? gnus-secondary-servers is obsolete,
+ ;; and it is not obvious that there is anything
+ ;; sensible to use instead in this particular case.
+ (if (boundp 'gnus-secondary-servers)
+ gnus-secondary-servers
+ (cdr gnus-select-method))))
;; We got a server name.
how))))
(gnus-browse-foreign-server method))
;; We got a server name.
how))))
(gnus-browse-foreign-server method))