From ed9eef249ba41f78604b236e7e0ff2e1dce9532f Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Tue, 30 Dec 2003 21:54:57 +0000 Subject: [PATCH] * gnus-score.el (gnus-score-find-trace): Added comment on sync with `gnus-score-edit-file-at-point'. * gnus-logic.el (gnus-score-advanced): Ditto. * gnus-score.el (gnus-score-edit-file-at-point): Fix for advanced scoring. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-logic.el | 1 + lisp/gnus-score.el | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5399ba220..c34ce330f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2003-12-30 Reiner Steib + + * gnus-score.el (gnus-score-find-trace): Added comment on sync + with `gnus-score-edit-file-at-point'. + + * gnus-logic.el (gnus-score-advanced): Ditto. + + * gnus-score.el (gnus-score-edit-file-at-point): Fix for + advanced scoring. + 2003-12-30 Simon Josefsson * gnus-score.el (gnus-score-edit-file-at-point): Use diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el index e6a18554e..c6bc031d9 100644 --- a/lisp/gnus-logic.el +++ b/lisp/gnus-logic.el @@ -77,6 +77,7 @@ 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) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 664a563c6..f30753984 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -1122,7 +1122,8 @@ If FORMAT, also format the current score file." (buffer-substring (point) (gnus-point-at-eol)) nil)))) (if (or (not file) - (string-match "non-file" file) + (string-match "\\<\\(non-file rule\\|A file\\)\\>" file) + ;; (see `gnus-score-find-trace' and `gnus-score-advanced') (string= "" file)) (gnus-error 3 "Can't find a score file in current line.") (gnus-score-edit-file file) @@ -2401,6 +2402,8 @@ score in `gnus-newsgroup-scored' by SCORE." (setq truncate-lines t) (dolist (entry trace) (setq file (or (car entry) + ;; Must be synced with + ;; `gnus-score-edit-file-at-point': "(non-file rule)")) (insert (format frmt -- 2.25.1