projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-summary-refer-thread): Implement a version that uses *-request-thread.
[gnus]
/
lisp
/
gnus-kill.el
diff --git
a/lisp/gnus-kill.el
b/lisp/gnus-kill.el
index
faddfdd
..
17a6266
100644
(file)
--- a/
lisp/gnus-kill.el
+++ b/
lisp/gnus-kill.el
@@
-1,16
+1,18
@@
;;; gnus-kill.el --- kill commands for Gnus
;;; gnus-kill.el --- kill commands for Gnus
-;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
-;; Lars Magne Ingebrigtsen <larsi@
ifi.uio.no
>
+;; Lars Magne Ingebrigtsen <larsi@
gnus.org
>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Keywords: news
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-33,7
+33,7
@@
(require 'gnus-range)
(defcustom gnus-kill-file-mode-hook nil
(require 'gnus-range)
(defcustom gnus-kill-file-mode-hook nil
- "
*
Hook for Gnus kill file mode."
+ "Hook for Gnus kill file mode."
:group 'gnus-score-kill
:type 'hook)
:group 'gnus-score-kill
:type 'hook)
@@
-49,7
+49,8
@@
:type 'boolean)
(defcustom gnus-winconf-kill-file nil
:type 'boolean)
(defcustom gnus-winconf-kill-file nil
- "*What does this do, Lars?"
+ "What does this do, Lars?
+I don't know, Per."
:group 'gnus-score-kill
:type 'sexp)
:group 'gnus-score-kill
:type 'sexp)
@@
-159,7
+160,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.
@@
-348,23
+349,22
@@
If NEWSGROUP is nil, return the global kill file instead."
(defun gnus-expunge (marks)
"Remove lines marked with MARKS."
(defun gnus-expunge (marks)
"Remove lines marked with MARKS."
- (save-excursion
- (set-buffer gnus-summary-buffer)
+ (with-current-buffer gnus-summary-buffer
(gnus-summary-limit-to-marks marks 'reverse)))
(defun gnus-apply-kill-file-unless-scored ()
"Apply .KILL file, unless a .SCORE file for the same newsgroup exists."
(cond ((file-exists-p (gnus-score-file-name gnus-newsgroup-name))
(gnus-summary-limit-to-marks marks 'reverse)))
(defun gnus-apply-kill-file-unless-scored ()
"Apply .KILL file, unless a .SCORE file for the same newsgroup exists."
(cond ((file-exists-p (gnus-score-file-name gnus-newsgroup-name))
-
;; Ignores global KILL.
-
(when (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name))
+ ;; Ignores global KILL.
+ (when (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name))
(gnus-message 3 "Note: Ignoring %s.KILL; preferring .SCORE"
gnus-newsgroup-name))
(gnus-message 3 "Note: Ignoring %s.KILL; preferring .SCORE"
gnus-newsgroup-name))
-
0)
-
((or (file-exists-p (gnus-newsgroup-kill-file nil))
-
(file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name)))
-
(gnus-apply-kill-file-internal))
-
(t
-
0)))
+ 0)
+ ((or (file-exists-p (gnus-newsgroup-kill-file nil))
+ (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name)))
+ (gnus-apply-kill-file-internal))
+ (t
+ 0)))
(defun gnus-apply-kill-file-internal ()
"Apply a kill file to the current newsgroup.
(defun gnus-apply-kill-file-internal ()
"Apply a kill file to the current newsgroup.
@@
-396,7
+396,7
@@
Returns the number of articles marked as read."
gnus-newsgroup-kill-headers))
(setq headers (cdr headers))))
(setq files nil))
gnus-newsgroup-kill-headers))
(setq headers (cdr headers))))
(setq files nil))
- (setq files (cdr files)))))
+ (setq files (cdr files)))))
(if (not gnus-newsgroup-kill-headers)
()
(save-window-excursion
(if (not gnus-newsgroup-kill-headers)
()
(save-window-excursion
@@
-406,7
+406,6
@@
Returns the number of articles marked as read."
()
(gnus-message 6 "Processing kill file %s..." (car kill-files))
(find-file (car kill-files))
()
(gnus-message 6 "Processing kill file %s..." (car kill-files))
(find-file (car kill-files))
- (gnus-add-current-to-buffer-list)
(goto-char (point-min))
(if (consp (ignore-errors (read (current-buffer))))
(goto-char (point-min))
(if (consp (ignore-errors (read (current-buffer))))
@@
-427,16
+426,6
@@
Returns the number of articles marked as read."
0))))
;; Parse a Gnus killfile.
0))))
;; Parse a Gnus killfile.
-(defun gnus-score-insert-help (string alist idx)
- (save-excursion
- (pop-to-buffer "*Score Help*")
- (buffer-disable-undo (current-buffer))
- (erase-buffer)
- (insert string ":\n\n")
- (while alist
- (insert (format " %c: %s\n" (caar alist) (nth idx (car alist))))
- (setq alist (cdr alist)))))
-
(defun gnus-kill-parse-gnus-kill-file ()
(goto-char (point-min))
(gnus-kill-file-mode)
(defun gnus-kill-parse-gnus-kill-file ()
(goto-char (point-min))
(gnus-kill-file-mode)
@@
-445,15
+434,14
@@
Returns the number of articles marked as read."
(setq beg (point))
(setq form (ignore-errors (read (current-buffer)))))
(unless (listp form)
(setq beg (point))
(setq form (ignore-errors (read (current-buffer)))))
(unless (listp form)
- (error "I
llegal
kill entry (possibly rn kill file?): %s" form))
+ (error "I
nvalid
kill entry (possibly rn kill file?): %s" form))
(if (or (eq (car form) 'gnus-kill)
(eq (car form) 'gnus-raise)
(eq (car form) 'gnus-lower))
(progn
(delete-region beg (point))
(insert (or (eval form) "")))
(if (or (eq (car form) 'gnus-kill)
(eq (car form) 'gnus-raise)
(eq (car form) 'gnus-lower))
(progn
(delete-region beg (point))
(insert (or (eval form) "")))
- (save-excursion
- (set-buffer gnus-summary-buffer)
+ (with-current-buffer gnus-summary-buffer
(ignore-errors (eval form)))))
(and (buffer-modified-p)
gnus-kill-save-kill-file
(ignore-errors (eval form)))))
(and (buffer-modified-p)
gnus-kill-save-kill-file
@@
-469,9
+457,9
@@
Returns the number of articles marked as read."
(?h . "")
(?f . "from")
(?: . "subject")))
(?h . "")
(?f . "from")
(?: . "subject")))
- (com-to-com
- '((?m . " ")
- (?j . "X")))
+
;;
(com-to-com
+
;;
'((?m . " ")
+
;;
(?j . "X")))
pattern modifier commands)
(while (not (eobp))
(if (not (looking-at "[ \t]*/\\([^/]*\\)/\\([ahfcH]\\)?:\\([a-z=:]*\\)"))
pattern modifier commands)
(while (not (eobp))
(if (not (looking-at "[ \t]*/\\([^/]*\\)/\\([ahfcH]\\)?:\\([a-z=:]*\\)"))
@@
-492,7
+480,7
@@
Returns the number of articles marked as read."
(or (cdr (assq modifier mod-to-header)) "subject")
pattern
(if (string-match "m" commands)
(or (cdr (assq modifier mod-to-header)) "subject")
pattern
(if (string-match "m" commands)
- '(gnus-summary-
mark-as-unread
nil " ")
+ '(gnus-summary-
tick-article
nil " ")
'(gnus-summary-mark-as-read nil "X"))
nil t))
(forward-line 1))))
'(gnus-summary-mark-as-read nil "X"))
nil t))
(forward-line 1))))
@@
-505,7
+493,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
@@
-522,10
+510,10
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(if (listp kill-list)
;; It is a list.
(if (not (consp (cdr kill-list)))
(if (listp kill-list)
;; It is a list.
(if (not (consp (cdr kill-list)))
- ;; It's o
n
the form (regexp . date).
+ ;; It's o
f
the form (regexp . date).
(if (zerop (gnus-execute field (car kill-list)
command nil (not all)))
(if (zerop (gnus-execute field (car kill-list)
command nil (not all)))
- (when (> (
gnus-
days-between date (cdr kill-list))
+ (when (> (days-between date (cdr kill-list))
gnus-kill-expiry-days)
(setq regexp nil))
(setcdr kill-list date))
gnus-kill-expiry-days)
(setq regexp nil))
(setcdr kill-list date))
@@
-536,7
+524,7
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(setq kdate (cdr kill))
(if (zerop (gnus-execute
field (car kill) command nil (not all)))
(setq kdate (cdr kill))
(if (zerop (gnus-execute
field (car kill) command nil (not all)))
- (when (> (
gnus-
days-between date kdate)
+ (when (> (days-between date kdate)
gnus-kill-expiry-days)
;; Time limit has been exceeded, so we
;; remove the match.
gnus-kill-expiry-days)
;; Time limit has been exceeded, so we
;; remove the match.
@@
-565,9
+553,8
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(and (eq 'quote (car (nth 2 object)))
(not (consp (cdadr (nth 2 object))))))
(concat "\n" (gnus-prin1-to-string object))
(and (eq 'quote (car (nth 2 object)))
(not (consp (cdadr (nth 2 object))))))
(concat "\n" (gnus-prin1-to-string object))
- (save-excursion
- (set-buffer (get-buffer-create "*Gnus PP*"))
- (buffer-disable-undo (current-buffer))
+ (with-current-buffer (gnus-get-buffer-create "*Gnus PP*")
+ (buffer-disable-undo)
(erase-buffer)
(insert (format "\n(%S %S\n '(" (nth 0 object) (nth 1 object)))
(let ((klist (cadr (nth 2 object)))
(erase-buffer)
(insert (format "\n(%S %S\n '(" (nth 0 object) (nth 1 object)))
(let ((klist (cadr (nth 2 object)))
@@
-587,7
+574,7
@@
COMMAND must be a lisp expression or a string representing a key sequence."
(insert "\n t"))
(insert ")")
(prog1
(insert "\n t"))
(insert ")")
(prog1
- (buffer-s
ubstring (point-min) (point-max)
)
+ (buffer-s
tring
)
(kill-buffer (current-buffer))))))
(defun gnus-execute-1 (function regexp form header)
(kill-buffer (current-buffer))))))
(defun gnus-execute-1 (function regexp form header)
@@
-607,7
+594,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)))))
@@
-620,38
+607,49
@@
COMMAND must be a lisp expression or a string representing a key sequence."
6 "Searching for article: %d..." (mail-header-number header))
(gnus-article-setup-buffer)
(gnus-article-prepare (mail-header-number header) t)
6 "Searching for article: %d..." (mail-header-number header))
(gnus-article-setup-buffer)
(gnus-article-prepare (mail-header-number header) t)
- (when (save-excursion
- (set-buffer gnus-article-buffer)
+ (when (with-current-buffer gnus-article-buffer
(goto-char (point-min))
(setq did-kill (re-search-forward regexp nil t)))
(cond ((stringp form) ;Keyboard macro.
(execute-kbd-macro form))
(goto-char (point-min))
(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
marked as read or ticked are ignored."
(save-excursion
(let ((killed-no 0)
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
marked as read or ticked are ignored."
(save-excursion
(let ((killed-no 0)
- function article header)
+ function article header
extras
)
(cond
;; Search body.
((or (null field)
(string-equal field ""))
(setq function nil))
;; Get access function of header field.
(cond
;; Search body.
((or (null field)
(string-equal field ""))
(setq function nil))
;; Get access function of header field.
- ((fboundp
- (setq function
- (intern-soft
- (concat "mail-header-" (downcase field)))))
- (setq function `(lambda (h) (,function h))))
+ ((cond ((fboundp
+ (setq function
+ (intern-soft
+ (concat "mail-header-" (downcase field)))))
+ (setq function `(lambda (h) (,function h))))
+ ((when (setq extras
+ (member (downcase field)
+ (mapcar (lambda (header)
+ (downcase (symbol-name header)))
+ gnus-extra-headers)))
+ (setq function
+ `(lambda (h)
+ (gnus-extra-header
+ (quote ,(nth (- (length gnus-extra-headers)
+ (length extras))
+ gnus-extra-headers))
+ h)))))))
;; Signal error.
(t
(error "Unknown header field: \"%s\"" field)))
;; Signal error.
(t
(error "Unknown header field: \"%s\"" field)))
@@
-683,10
+681,10
@@
Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
(concat "options -n "
(mapconcat 'identity command-line-args-left " "))))
(gnus-expert-user t)
(concat "options -n "
(mapconcat 'identity command-line-args-left " "))))
(gnus-expert-user t)
- (
nnmail-spool-file
nil)
+ (
mail-sources
nil)
(gnus-use-dribble-file nil)
(gnus-batch-mode t)
(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
@@
-698,12
+696,13
@@
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))))))
- (gnus-summary-read-group group nil t nil t)
+ (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))
(gnus-summary-exit))))
;; Exit Emacs.
(when (eq (current-buffer) (get-buffer gnus-summary-buffer))
(gnus-summary-exit))))
;; Exit Emacs.