projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(auth-source-netrc-parse): Accept a number as the port spec, too.
[gnus]
/
lisp
/
gnus-logic.el
diff --git
a/lisp/gnus-logic.el
b/lisp/gnus-logic.el
index
77fc948
..
51b44e6
100644
(file)
--- a/
lisp/gnus-logic.el
+++ b/
lisp/gnus-logic.el
@@
-1,16
+1,16
@@
;;; gnus-logic.el --- advanced scoring code for Gnus
;;; gnus-logic.el --- advanced scoring code for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;;
Free Software Foundation, Inc.
+
+;;
Copyright (C) 1996-2011
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; 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
+18,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:
@@
-54,8
+52,7
@@
("body" nil gnus-advanced-body)
("all" nil gnus-advanced-body)))
("body" nil gnus-advanced-body)
("all" nil gnus-advanced-body)))
-(eval-and-compile
- (autoload 'parse-time-string "parse-time"))
+(autoload 'parse-time-string "parse-time")
(defun gnus-score-advanced (rule &optional trace)
"Apply advanced scoring RULE to all the articles in the current group."
(defun gnus-score-advanced (rule &optional trace)
"Apply advanced scoring RULE to all the articles in the current group."
@@
-77,6
+74,7
@@
gnus-newsgroup-scored)
(when trace
(push (cons "A file" rule)
gnus-newsgroup-scored)
(when trace
(push (cons "A file" rule)
+ ;; Must be synced with `gnus-score-edit-file-at-point'.
gnus-score-trace)))))))
(defun gnus-advanced-score-rule (rule)
gnus-score-trace)))))))
(defun gnus-advanced-score-rule (rule)
@@
-161,7
+159,7
@@
(defun gnus-advanced-integer (index match type)
(if (not (memq type '(< > <= >= =)))
(error "No such integer score type: %s" type)
(defun gnus-advanced-integer (index match type)
(if (not (memq type '(< > <= >= =)))
(error "No such integer score type: %s" type)
- (funcall type
match (or (aref gnus-advanced-headers index) 0)
)))
+ (funcall type
(or (aref gnus-advanced-headers index) 0) match
)))
(defun gnus-advanced-date (index match type)
(let ((date (apply 'encode-time (parse-time-string
(defun gnus-advanced-date (index match type)
(let ((date (apply 'encode-time (parse-time-string
@@
-180,8
+178,7
@@
(defun gnus-advanced-body (header match type)
(when (string= header "all")
(setq header "article"))
(defun gnus-advanced-body (header match type)
(when (string= header "all")
(setq header "article"))
- (save-excursion
- (set-buffer nntp-server-buffer)
+ (with-current-buffer nntp-server-buffer
(let* ((request-func (cond ((string= "head" header)
'gnus-request-head)
((string= "body" header)
(let* ((request-func (cond ((string= "head" header)
'gnus-request-head)
((string= "body" header)