diff options
author | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-02-17 07:50:28 -0800 |
commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/mh-e | |
parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'lisp/mh-e')
-rw-r--r-- | lisp/mh-e/mh-e.el | 2 | ||||
-rw-r--r-- | lisp/mh-e/mh-mime.el | 2 | ||||
-rw-r--r-- | lisp/mh-e/mh-search.el | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 63d7a2973fb..05ff672da52 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -831,7 +831,7 @@ This assumes that a temporary buffer is set up." (expand-file-name "flists" dir))))))))) (defun mh-file-command-p (file) - "Return t if file FILE is the name of a executable regular file." + "Return t if file FILE is the name of an executable regular file." (and (file-regular-p file) (file-executable-p file))) (defun mh-variant-set-variant (variant) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 967eb869a25..e2c682a3996 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1242,7 +1242,7 @@ MESSAGE number." "message/rfc822" (if (string= "" description) nil description) "inline")) - (t (error "The message number, %s, is not a integer" msg))))) + (t (error "The message number, %s, is not an integer" msg))))) (defun mh-mh-forward-message (&optional description folder messages) "Add tag to forward a message. diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 3e591c65383..8b8ba964560 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -443,7 +443,7 @@ search all folders." (setq redo-flag t)) ((mh-folder-exists-p new-folder) ;; Folder exists but we don't have it open. That means they are - ;; stale results from a old flists search. Clear it out. + ;; stale results from an old flists search. Clear it out. (mh-exec-cmd-quiet nil "rmf" new-folder))) (setq message (mh-search "+" mh-flists-results-folder redo-flag window-config) @@ -1583,7 +1583,7 @@ If the folder returned doesn't exist then it is created." chosen-name)) (defun mh-index-folder-search-regexp (folder) - "If FOLDER was created by a index search, return the search regexp. + "If FOLDER was created by an index search, return the search regexp. Return nil if FOLDER doesn't exist or the .mhe_index file is garbled." (ignore-errors @@ -1912,7 +1912,7 @@ origin-index) map is updated too." (defun mh-index-update-single-msg (msg checksum origin-map) "Update various maps for one message. -MSG is a index folder message, CHECKSUM its MD5 hash and +MSG is an index folder message, CHECKSUM its MD5 hash and ORIGIN-MAP, if non-nil, a hash table containing which maps each message in the index folder to the folder and message that it was copied from. The function updates the hash tables |