projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from gnus--rel--5.10
[gnus]
/
lisp
/
gnus-kill.el
diff --git
a/lisp/gnus-kill.el
b/lisp/gnus-kill.el
index
41965a9
..
7a18ab8
100644
(file)
--- a/
lisp/gnus-kill.el
+++ b/
lisp/gnus-kill.el
@@
-1,6
+1,7
@@
;;; gnus-kill.el --- kill commands for Gnus
;;; gnus-kill.el --- kill commands for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
-;; Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@gnus.org>
@@
-20,8
+21,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-161,7
+162,7
@@
gnus-kill-file-mode-hook with no arguments, if that value is non-nil."
(setq major-mode 'gnus-kill-file-mode)
(setq mode-name "Kill")
(lisp-mode-variables nil)
(setq major-mode 'gnus-kill-file-mode)
(setq mode-name "Kill")
(lisp-mode-variables nil)
- (gnus-run-hooks 'emacs-lisp-mode-hook 'gnus-kill-file-mode-hook))
+ (gnus-run-
mode-
hooks 'emacs-lisp-mode-hook 'gnus-kill-file-mode-hook))
(defun gnus-kill-file-edit-file (newsgroup)
"Begin editing a kill file for NEWSGROUP.
(defun gnus-kill-file-edit-file (newsgroup)
"Begin editing a kill file for NEWSGROUP.
@@
-496,7
+497,7
@@
Optional 1st argument COMMAND is default to
(gnus-summary-mark-as-read nil \"X\").
If optional 2nd argument ALL is non-nil, articles marked are also applied to.
If FIELD is an empty string (or nil), entire article body is searched for.
(gnus-summary-mark-as-read nil \"X\").
If optional 2nd argument ALL is non-nil, articles marked are also applied to.
If FIELD is an empty string (or nil), entire article body is searched for.
-COMMAND must be a
l
isp expression or a string representing a key sequence."
+COMMAND must be a
L
isp expression or a string representing a key sequence."
;; We don't want to change current point nor window configuration.
(let ((old-buffer (current-buffer)))
(save-excursion
;; We don't want to change current point nor window configuration.
(let ((old-buffer (current-buffer)))
(save-excursion
@@
-598,7
+599,7
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(setq did-kill (string-match regexp value)))
(cond ((stringp form) ;Keyboard macro.
(execute-kbd-macro form))
(setq did-kill (string-match regexp value)))
(cond ((stringp form) ;Keyboard macro.
(execute-kbd-macro form))
- ((
gnus-
functionp form)
+ ((functionp form)
(funcall form))
(t
(eval form)))))
(funcall form))
(t
(eval form)))))
@@
-617,14
+618,14
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(setq did-kill (re-search-forward regexp nil t)))
(cond ((stringp form) ;Keyboard macro.
(execute-kbd-macro form))
(setq did-kill (re-search-forward regexp nil t)))
(cond ((stringp form) ;Keyboard macro.
(execute-kbd-macro form))
- ((
gnus-
functionp form)
+ ((functionp form)
(funcall form))
(t
(eval form)))))))
did-kill)))
(defun gnus-execute (field regexp form &optional backward unread)
(funcall form))
(t
(eval form)))))))
did-kill)))
(defun gnus-execute (field regexp form &optional backward unread)
- "If FIELD of article header matches REGEXP, execute
l
isp FORM (or a string).
+ "If FIELD of article header matches REGEXP, execute
L
isp FORM (or a string).
If FIELD is an empty string (or nil), entire article body is searched for.
If optional 1st argument BACKWARD is non-nil, do backward instead.
If optional 2nd argument UNREAD is non-nil, articles which are
If FIELD is an empty string (or nil), entire article body is searched for.
If optional 1st argument BACKWARD is non-nil, do backward instead.
If optional 2nd argument UNREAD is non-nil, articles which are
@@
-690,7
+691,7
@@
Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
(mail-sources nil)
(gnus-use-dribble-file nil)
(gnus-batch-mode t)
(mail-sources nil)
(gnus-use-dribble-file nil)
(gnus-batch-mode t)
- info group newsrc
entry
+ info group newsrc
unread
;; Disable verbose message.
gnus-novice-user gnus-large-newsgroup
gnus-options-subscribe gnus-auto-subscribed-groups
;; Disable verbose message.
gnus-novice-user gnus-large-newsgroup
gnus-options-subscribe gnus-auto-subscribed-groups
@@
-702,11
+703,11
@@
Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
(setq newsrc (cdr gnus-newsrc-alist))
(while (setq info (pop newsrc))
(setq group (gnus-info-group info)
(setq newsrc (cdr gnus-newsrc-alist))
(while (setq info (pop newsrc))
(setq group (gnus-info-group info)
-
entry (gnus-gethash group gnus-newsrc-hashtb
))
+
unread (gnus-group-unread group
))
(when (and (<= (gnus-info-level info) gnus-level-subscribed)
(when (and (<= (gnus-info-level info) gnus-level-subscribed)
- (and
(car entry)
- (or (eq
(car entry)
t)
- (not (zerop
(car entry)
)))))
+ (and
unread
+ (or (eq
unread
t)
+ (not (zerop
unread
)))))
(ignore-errors
(gnus-summary-read-group group nil t nil t))
(when (eq (current-buffer) (get-buffer gnus-summary-buffer))
(ignore-errors
(gnus-summary-read-group group nil t nil t))
(when (eq (current-buffer) (get-buffer gnus-summary-buffer))
@@
-717,4
+718,5
@@
Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
(provide 'gnus-kill)
(provide 'gnus-kill)
+;;; arch-tag: b30c0f53-df1a-490b-b81e-17b13474f395
;;; gnus-kill.el ends here
;;; gnus-kill.el ends here