diff options
| author | Kenichi Handa <handa@etlken> | 2010-04-23 11:17:09 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-04-23 11:17:09 +0900 |
| commit | 5315723bbea1e7b65c3e5f3aed0ad716fa169d28 (patch) | |
| tree | a2f6cb12b284dfbfbd4f441a767bc0977b676084 | |
| parent | 81b14dd29dfa5db5b285bcbc3f72865004754200 (diff) | |
| parent | 770255e957e3881176087fa23c74c759ed56c1fa (diff) | |
| download | emacs-5315723bbea1e7b65c3e5f3aed0ad716fa169d28.tar.gz | |
merge trunk
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/filecache.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 1 |
4 files changed, 17 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63bd341d779..8de72e751fd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-04-23 Juanma Barranquero <lekktu@gmail.com> + + * filecache.el (file-cache-add-directory-list) + (file-cache-add-directory-recursively): Fix typos in docstrings. + 2010-04-22 Kenichi Handa <handa@m17n.org> * language/indian.el (gurmukhi-composable-pattern): Fix typo. diff --git a/lisp/filecache.el b/lisp/filecache.el index d8a284d7dce..b4b1e8bd954 100644 --- a/lisp/filecache.el +++ b/lisp/filecache.el @@ -296,8 +296,8 @@ be added to the cache." (defun file-cache-add-directory-list (directory-list &optional regexp) "Add DIRECTORY-LIST (a list of directory names) to the file cache. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself." +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself." (interactive "XAdd files from directory list: ") (mapcar (lambda (dir) (file-cache-add-directory dir regexp)) @@ -370,10 +370,10 @@ STRING is passed as an argument to the locate command." ;;;###autoload (defun file-cache-add-directory-recursively (dir &optional regexp) "Adds DIR and any subdirectories to the file-cache. -This function does not use any external programs +This function does not use any external programs. If the optional REGEXP argument is non-nil, only files which match it -will be added to the cache. Note that the REGEXP is applied to the files -in each directory, not to the directory list itself." +will be added to the cache. Note that the REGEXP is applied to the +files in each directory, not to the directory list itself." (interactive "DAdd directory: ") (require 'find-lisp) (mapcar diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5e70b49a862..ab1210af5b5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2010-04-22 Andreas Seltenreich <seltenreich@gmx.de> + + * message.el (message-generate-headers): Record insertion of optional + headers as well. Otherwise the check to prevent repeated insertion of + optional headers is a no-op. + 2010-04-17 Teodor Zlatanov <tzz@lifelogs.com> * smime.el: Don't mention CVS. diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 27266f8aec1..2fe8a4d32ef 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -5880,6 +5880,7 @@ Headers already prepared in the buffer are not modified." (if formatter (funcall formatter header value) (insert header-string ": " value)) + (push header-string message-inserted-headers) (goto-char (message-fill-field)) ;; We check whether the value was ended by a ;; newline. If not, we insert one. |