procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge trunk

Browse source
This commit is contained in:
Kenichi Handa 2010-04-23 11:17:09 +09:00
commit 5315723bbe
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

10
lisp/filecache.el
View file

@ -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

6
lisp/gnus/ChangeLog
View file

@ -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.

1
lisp/gnus/message.el
View file

@ -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.