aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2005-11-11 05:14:27 +0000
committerMiles Bader2005-11-11 05:14:27 +0000
commite8beac8a045209d11776b4a4e501df3630c9b746 (patch)
treea99351d5c75ba6eb202b2aa9748e25eef1e97c28
parentbe93a2c4484181639c468e79f015739129eaa90b (diff)
downloademacs-e8beac8a045209d11776b4a4e501df3630c9b746.tar.gz
emacs-e8beac8a045209d11776b4a4e501df3630c9b746.zip
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-646
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 152-156) - Update from CVS: lisp/mml.el (mml-preview): Doc fix. - Update from CVS 2005-11-09 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/message.el (message-generate-headers): Downcase the argument given to message-check-element. 2005-11-01 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus.el (gnus-parameters-case-fold-search): New variable. (gnus-parameters-get-parameter): Use it. * lisp/gnus/gnus-score.el (gnus-home-score-file): Doc fix. 2005-11-01 Xavier Maillard <zedek@gnu-rox.org> (tiny change) * lisp/gnus/gnus-score.el (gnus-update-score-entry-dates): Doc fix. 2005-10-31 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/mml.el (mml-preview): Doc fix. 2005-11-10 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (XVarious): Fix description of gnus-use-toolbar; add new variable gnus-toolbar-thickness. 2005-11-08 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (XVarious): Revert description of gnus-use-toolbar. 2005-11-07 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (X-Face): Fix description. (XVarious): Remove gnus-xmas-logo-color-alist and gnus-xmas-logo-color-style; fix description of gnus-use-toolbar. 2005-11-01 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (Group Parameters): Mention new varable gnus-parameters-case-fold-search. (Home Score File): Addition.
-rw-r--r--lisp/gnus/ChangeLog20
-rw-r--r--lisp/gnus/gnus-score.el6
-rw-r--r--lisp/gnus/gnus.el16
-rw-r--r--lisp/gnus/message.el3
-rw-r--r--lisp/gnus/mml.el2
-rw-r--r--man/ChangeLog21
-rw-r--r--man/gnus.texi54
7 files changed, 95 insertions, 27 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6c96e46333f..25851c07f7d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
12005-11-09 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * message.el (message-generate-headers): Downcase the argument
4 given to message-check-element.
5
62005-11-01 Katsumi Yamaoka <yamaoka@jpl.org>
7
8 * gnus.el (gnus-parameters-case-fold-search): New variable.
9 (gnus-parameters-get-parameter): Use it.
10
11 * gnus-score.el (gnus-home-score-file): Doc fix.
12
132005-11-01 Xavier Maillard <zedek@gnu-rox.org> (tiny change)
14
15 * gnus-score.el (gnus-update-score-entry-dates): Doc fix.
16
172005-10-31 Katsumi Yamaoka <yamaoka@jpl.org>
18
19 * mml.el (mml-preview): Doc fix.
20
12005-10-27 Reiner Steib <Reiner.Steib@gmx.de> 212005-10-27 Reiner Steib <Reiner.Steib@gmx.de>
2 22
3 * flow-fill.el (fill-flowed-encode-tests): Restore trailing 23 * flow-fill.el (fill-flowed-encode-tests): Restore trailing
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 2858ecb8343..f9edda4ec64 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -142,7 +142,7 @@ If this variable is nil, no score file entries will be expired."
142 number)) 142 number))
143 143
144(defcustom gnus-update-score-entry-dates t 144(defcustom gnus-update-score-entry-dates t
145 "*In non-nil, update matching score entry dates. 145 "*If non-nil, update matching score entry dates.
146If this variable is nil, then score entries that provide matches 146If this variable is nil, then score entries that provide matches
147will be expired along with non-matching score entries." 147will be expired along with non-matching score entries."
148 :group 'gnus-score-expire 148 :group 'gnus-score-expire
@@ -175,7 +175,7 @@ It is called with one parameter -- the score to be decayed."
175It can be: 175It can be:
176 176
177 * A string 177 * A string
178 This file file will be used as the home score file. 178 This file will be used as the home score file.
179 179
180 * A function 180 * A function
181 The result of this function will be used as the home score file. 181 The result of this function will be used as the home score file.
@@ -186,7 +186,7 @@ It can be:
186 The elements in this list can be: 186 The elements in this list can be:
187 187
188 * `(regexp file-name ...)' 188 * `(regexp file-name ...)'
189 If the `regexp' matches the group name, the first `file-name' will 189 If the `regexp' matches the group name, the first `file-name'
190 will be used as the home score file. (Multiple filenames are 190 will be used as the home score file. (Multiple filenames are
191 allowed so that one may use gnus-score-file-single-match-alist to 191 allowed so that one may use gnus-score-file-single-match-alist to
192 set this variable.) 192 set this variable.)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 5d35137aec6..578fc49395c 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1104,6 +1104,17 @@ For example:
1104 :type '(repeat (cons regexp 1104 :type '(repeat (cons regexp
1105 (repeat sexp)))) 1105 (repeat sexp))))
1106 1106
1107(defcustom gnus-parameters-case-fold-search 'default
1108 "If it is t, ignore case of group names specified in `gnus-parameters'.
1109If it is nil, don't ignore case. If it is `default', which is for the
1110backward compatibility, use the value of `case-fold-search'."
1111 :version "22.1"
1112 :group 'gnus-group-various
1113 :type '(choice :format "%{%t%}:\n %[Value Menu%] %v"
1114 (const :tag "Use `case-fold-search'" default)
1115 (const nil)
1116 (const t)))
1117
1107(defvar gnus-group-parameters-more nil) 1118(defvar gnus-group-parameters-more nil)
1108 1119
1109(defmacro gnus-define-group-parameter (param &rest rest) 1120(defmacro gnus-define-group-parameter (param &rest rest)
@@ -3722,7 +3733,10 @@ You should probably use `gnus-find-method-for-group' instead."
3722 3733
3723(defun gnus-parameters-get-parameter (group) 3734(defun gnus-parameters-get-parameter (group)
3724 "Return the group parameters for GROUP from `gnus-parameters'." 3735 "Return the group parameters for GROUP from `gnus-parameters'."
3725 (let (params-list) 3736 (let ((case-fold-search (if (eq gnus-parameters-case-fold-search 'default)
3737 case-fold-search
3738 gnus-parameters-case-fold-search))
3739 params-list)
3726 (dolist (elem gnus-parameters) 3740 (dolist (elem gnus-parameters)
3727 (when (string-match (car elem) group) 3741 (when (string-match (car elem) group)
3728 (setq params-list 3742 (setq params-list
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6b1cd32d03d..019b5bd4f07 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5077,7 +5077,8 @@ Headers already prepared in the buffer are not modified."
5077 ;; The element is a symbol. We insert the value 5077 ;; The element is a symbol. We insert the value
5078 ;; of this symbol, if any. 5078 ;; of this symbol, if any.
5079 (symbol-value header)) 5079 (symbol-value header))
5080 ((not (message-check-element header)) 5080 ((not (message-check-element
5081 (intern (downcase (symbol-name header)))))
5081 ;; We couldn't generate a value for this header, 5082 ;; We couldn't generate a value for this header,
5082 ;; so we just ask the user. 5083 ;; so we just ask the user.
5083 (read-from-minibuffer 5084 (read-from-minibuffer
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 3024959ae7f..8b00313fb92 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1102,7 +1102,7 @@ Should be adopted if code in `message-send-mail' is changed."
1102 1102
1103(defun mml-preview (&optional raw) 1103(defun mml-preview (&optional raw)
1104 "Display current buffer with Gnus, in a new buffer. 1104 "Display current buffer with Gnus, in a new buffer.
1105If RAW, don't highlight the article." 1105If RAW, display a raw encoded MIME message."
1106 (interactive "P") 1106 (interactive "P")
1107 (save-excursion 1107 (save-excursion
1108 (let* ((buf (current-buffer)) 1108 (let* ((buf (current-buffer))
diff --git a/man/ChangeLog b/man/ChangeLog
index 834430260c1..c01b05112f4 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,24 @@
12005-11-10 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * gnus.texi (XVarious): Fix description of gnus-use-toolbar; add
4 new variable gnus-toolbar-thickness.
5
62005-11-08 Katsumi Yamaoka <yamaoka@jpl.org>
7
8 * gnus.texi (XVarious): Revert description of gnus-use-toolbar.
9
102005-11-07 Katsumi Yamaoka <yamaoka@jpl.org>
11
12 * gnus.texi (X-Face): Fix description.
13 (XVarious): Remove gnus-xmas-logo-color-alist and
14 gnus-xmas-logo-color-style; fix description of gnus-use-toolbar.
15
162005-11-01 Katsumi Yamaoka <yamaoka@jpl.org>
17
18 * gnus.texi (Group Parameters): Mention new varable
19 gnus-parameters-case-fold-search.
20 (Home Score File): Addition.
21
12005-11-09 Luc Teirlinck <teirllm@auburn.edu> 222005-11-09 Luc Teirlinck <teirllm@auburn.edu>
2 23
3 * killing.texi (CUA Bindings): Add @section. 24 * killing.texi (CUA Bindings): Add @section.
diff --git a/man/gnus.texi b/man/gnus.texi
index cbd8554c382..a588dd78974 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -3060,6 +3060,19 @@ example:
3060String value of parameters will be subjected to regexp substitution, as 3060String value of parameters will be subjected to regexp substitution, as
3061the @code{to-group} example shows. 3061the @code{to-group} example shows.
3062 3062
3063@vindex gnus-parameters-case-fold-search
3064By default, whether comparing the group name and one of those regexps
3065specified in @code{gnus-parameters} is done in a case-sensitive manner
3066or a case-insensitive manner depends on the value of
3067@code{case-fold-search} at the time when the comparison is done. The
3068value of @code{case-fold-search} is typically @code{t}; it means, for
3069example, the element @code{("INBOX\\.FOO" (total-expire . t))} might be
3070applied to both the @samp{INBOX.FOO} group and the @samp{INBOX.foo}
3071group. If you want to make those regexps always case-sensitive, set the
3072value of the @code{gnus-parameters-case-fold-search} variable to
3073@code{nil}. Otherwise, set it to @code{t} if you want to compare them
3074always in a case-insensitive manner.
3075
3063 3076
3064@node Listing Groups 3077@node Listing Groups
3065@section Listing Groups 3078@section Listing Groups
@@ -19755,7 +19768,8 @@ group name, the @var{file-name} will be used as the home score file.
19755 19768
19756@item 19769@item
19757A function. If the function returns non-@code{nil}, the result will 19770A function. If the function returns non-@code{nil}, the result will
19758be used as the home score file. 19771be used as the home score file. The function will be called with the
19772name of the group as the parameter.
19759 19773
19760@item 19774@item
19761A string. Use the string as the home score file. 19775A string. Use the string as the home score file.
@@ -21967,11 +21981,11 @@ function, this function will be called with the face as the argument.
21967If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches 21981If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
21968the @code{From} header, the face will not be shown. 21982the @code{From} header, the face will not be shown.
21969 21983
21970The default action under Emacs 20 is to fork off the @code{display} 21984The default action under Emacs without image support is to fork off the
21971program@footnote{@code{display} is from the ImageMagick package. For 21985@code{display} program@footnote{@code{display} is from the ImageMagick
21972the @code{uncompface} and @code{icontopbm} programs look for a package 21986package. For the @code{uncompface} and @code{icontopbm} programs look
21973like @code{compface} or @code{faces-xface} on a GNU/Linux system.} to 21987for a package like @code{compface} or @code{faces-xface} on a GNU/Linux
21974view the face. 21988system.} to view the face.
21975 21989
21976Under XEmacs or Emacs 21+ with suitable image support, the default 21990Under XEmacs or Emacs 21+ with suitable image support, the default
21977action is to display the face before the @code{From} header. (It's 21991action is to display the face before the @code{From} header. (It's
@@ -22217,18 +22231,6 @@ This is where Gnus will look for pictures. Gnus will normally
22217auto-detect this directory, but you may set it manually if you have an 22231auto-detect this directory, but you may set it manually if you have an
22218unusual directory structure. 22232unusual directory structure.
22219 22233
22220@item gnus-xmas-logo-color-alist
22221@vindex gnus-xmas-logo-color-alist
22222This is an alist where the key is a type symbol and the values are the
22223foreground and background color of the splash page glyph.
22224
22225@item gnus-xmas-logo-color-style
22226@vindex gnus-xmas-logo-color-style
22227This is the key used to look up the color in the alist described above.
22228Valid values include @code{flame}, @code{pine}, @code{moss},
22229@code{irish}, @code{sky}, @code{tin}, @code{velvet}, @code{grape},
22230@code{labia}, @code{berry}, @code{neutral}, and @code{september}.
22231
22232@item gnus-xmas-modeline-glyph 22234@item gnus-xmas-modeline-glyph
22233@vindex gnus-xmas-modeline-glyph 22235@vindex gnus-xmas-modeline-glyph
22234A glyph displayed in all Gnus mode lines. It is a tiny gnu head by 22236A glyph displayed in all Gnus mode lines. It is a tiny gnu head by
@@ -22242,9 +22244,19 @@ default.
22242 22244
22243@item gnus-use-toolbar 22245@item gnus-use-toolbar
22244@vindex gnus-use-toolbar 22246@vindex gnus-use-toolbar
22245If @code{nil}, don't display toolbars. If non-@code{nil}, it should be 22247This variable specifies the position to display the toolbar. If
22246one of @code{default-toolbar}, @code{top-toolbar}, @code{bottom-toolbar}, 22248@code{nil}, don't display toolbars. If it is non-nil, it should be one
22247@code{right-toolbar}, or @code{left-toolbar}. 22249of the symbols @code{default}, @code{top}, @code{bottom}, @code{right},
22250and @code{left}. @code{default} means to use the default toolbar, the
22251rest mean to display the toolbar on the place which those names show.
22252The default is @code{default}.
22253
22254@item gnus-toolbar-thickness
22255@vindex gnus-toolbar-thickness
22256Cons of the height and the width specifying the thickness of a toolbar.
22257The height is used for the toolbar displayed on the top or the bottom,
22258the width is used for the toolbar displayed on the right or the left.
22259The default is that of the default toolbar.
22248 22260
22249@item gnus-group-toolbar 22261@item gnus-group-toolbar
22250@vindex gnus-group-toolbar 22262@vindex gnus-group-toolbar