aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-06-16 14:47:52 +0000
committerJuanma Barranquero2005-06-16 14:47:52 +0000
commitb66c24b4429c4ef3acf555c400169fd8090de195 (patch)
tree0f71098459df925e98f2fe54e36faed21ebe8760
parent998a5a9558b2aed55cf8fbc68ad6f0026948f261 (diff)
downloademacs-b66c24b4429c4ef3acf555c400169fd8090de195.tar.gz
emacs-b66c24b4429c4ef3acf555c400169fd8090de195.zip
(gnus-score-customize): Don't use `format' on `error' arguments.
-rw-r--r--lisp/gnus/ChangeLog12
-rw-r--r--lisp/gnus/gnus-cus.el10
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f784487c3d1..1e647d89ea8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12005-06-16 Juanma Barranquero <lekktu@gmail.com>
2
3 * gnus-art.el (gnus-article-encrypt-body):
4 * gnus-cus.el (gnus-score-customize):
5 Don't use `format' on `error' arguments.
6
12005-06-16 Miles Bader <miles@gnu.org> 72005-06-16 Miles Bader <miles@gnu.org>
2 8
3 * spam.el (spam): Remove "-face" suffix from face name. 9 * spam.el (spam): Remove "-face" suffix from face name.
@@ -79,7 +85,7 @@
79 (gnus-server-agent): Remove "-face" suffix from face names. 85 (gnus-server-agent): Remove "-face" suffix from face names.
80 (gnus-server-agent-face, gnus-server-opened-face) 86 (gnus-server-agent-face, gnus-server-opened-face)
81 (gnus-server-closed-face, gnus-server-denied-face) 87 (gnus-server-closed-face, gnus-server-denied-face)
82 (gnus-server-offline-face): 88 (gnus-server-offline-face):
83 New backward-compatibility aliases for renamed faces. 89 New backward-compatibility aliases for renamed faces.
84 (gnus-server-agent-face, gnus-server-opened-face) 90 (gnus-server-agent-face, gnus-server-opened-face)
85 (gnus-server-closed-face, gnus-server-denied-face) 91 (gnus-server-closed-face, gnus-server-denied-face)
@@ -97,7 +103,7 @@
97 (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2) 103 (gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
98 (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5) 104 (gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
99 (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8) 105 (gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
100 (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11): 106 (gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
101 New backward-compatibility aliases for renamed faces. 107 New backward-compatibility aliases for renamed faces.
102 (gnus-cite-attribution-face, gnus-cite-face-list) 108 (gnus-cite-attribution-face, gnus-cite-face-list)
103 (gnus-article-boring-faces): Use renamed gnus faces. 109 (gnus-article-boring-faces): Use renamed gnus faces.
@@ -107,7 +113,7 @@
107 (gnus-header-content): Remove "-face" suffix from face names. 113 (gnus-header-content): Remove "-face" suffix from face names.
108 (gnus-signature-face, gnus-header-from-face) 114 (gnus-signature-face, gnus-header-from-face)
109 (gnus-header-subject-face, gnus-header-newsgroups-face) 115 (gnus-header-subject-face, gnus-header-newsgroups-face)
110 (gnus-header-name-face, gnus-header-content-face): 116 (gnus-header-name-face, gnus-header-content-face):
111 New backward-compatibility aliases for renamed faces. 117 New backward-compatibility aliases for renamed faces.
112 (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces. 118 (gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
113 119
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index 0c31ea9dd1b..1a595a6ab7a 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -772,8 +772,8 @@ When called interactively, FILE defaults to the current score file.
772This can be changed using the `\\[gnus-score-change-score-file]' command." 772This can be changed using the `\\[gnus-score-change-score-file]' command."
773 (interactive (list gnus-current-score-file)) 773 (interactive (list gnus-current-score-file))
774 (unless file 774 (unless file
775 (error (format "No score file for %s" 775 (error "No score file for %s"
776 (gnus-group-decoded-name gnus-newsgroup-name)))) 776 (gnus-group-decoded-name gnus-newsgroup-name)))
777 (let ((scores (gnus-score-load file)) 777 (let ((scores (gnus-score-load file))
778 (types (mapcar (lambda (entry) 778 (types (mapcar (lambda (entry)
779 `(group :format "%v%h\n" 779 `(group :format "%v%h\n"
@@ -1014,9 +1014,9 @@ articles in the thread.
1014 ;; gnus-agent-cat-prepare-category-field as I don't want the 1014 ;; gnus-agent-cat-prepare-category-field as I don't want the
1015 ;; group list to appear when customizing a topic. 1015 ;; group list to appear when customizing a topic.
1016 (widget-insert "\n") 1016 (widget-insert "\n")
1017 1017
1018 (let ((symb 1018 (let ((symb
1019 (set 1019 (set
1020 (make-local-variable 'gnus-agent-cat-groups) 1020 (make-local-variable 'gnus-agent-cat-groups)
1021 (widget-create 1021 (widget-create
1022 `(choice 1022 `(choice