Mercurial > emacs
changeset 108346:2ec6d6660253
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 23 Apr 2010 11:17:09 +0900 |
| parents | 7556a311a89c (current diff) 066c6d53b8b9 (diff) |
| children | 39d09d6f8dbc 65d3d6eb6e3a |
| files | |
| diffstat | 4 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 23 11:14:40 2010 +0900 +++ b/lisp/ChangeLog Fri Apr 23 11:17:09 2010 +0900 @@ -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.
--- a/lisp/filecache.el Fri Apr 23 11:14:40 2010 +0900 +++ b/lisp/filecache.el Fri Apr 23 11:17:09 2010 +0900 @@ -296,8 +296,8 @@ (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 @@ ;;;###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
--- a/lisp/gnus/ChangeLog Fri Apr 23 11:14:40 2010 +0900 +++ b/lisp/gnus/ChangeLog Fri Apr 23 11:17:09 2010 +0900 @@ -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.
--- a/lisp/gnus/message.el Fri Apr 23 11:14:40 2010 +0900 +++ b/lisp/gnus/message.el Fri Apr 23 11:17:09 2010 +0900 @@ -5880,6 +5880,7 @@ (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.