diff options
Diffstat (limited to 'lisp/mh-e/mh-utils.el')
| -rw-r--r-- | lisp/mh-e/mh-utils.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index 09448feb136..37fd1651c5e 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -1,6 +1,6 @@ ;;; mh-utils.el --- MH-E general utilities -;; Copyright (C) 1993, 1995, 1997, 2000-2013 Free Software Foundation, +;; Copyright (C) 1993, 1995, 1997, 2000-2015 Free Software Foundation, ;; Inc. ;; Author: Bill Wohler <wohler@newt.com> @@ -419,21 +419,21 @@ names and the function is called when OUTPUT is available." return-nil-if-folder-empty) "Normalizes FOLDER name. -Makes sure that two '/' characters never occur next to each -other. Also all occurrences of \"..\" and \".\" are suitably +Makes sure that two `/' characters never occur next to each +other. Also all occurrences of `..' and `.' are suitably processed. So \"+inbox/../news\" will be normalized to \"+news\". -If optional argument EMPTY-STRING-OKAY is nil then a '+' is added +If optional argument EMPTY-STRING-OKAY is nil then a `+' is added at the front if FOLDER lacks one. If non-nil and FOLDER is the empty string then nothing is added. If optional argument DONT-REMOVE-TRAILING-SLASH is non-nil then a -trailing '/' if present is retained (if present), otherwise it is +trailing `/' if present is retained (if present), otherwise it is removed. If optional argument RETURN-NIL-IF-FOLDER-EMPTY is non-nil, then return nil if FOLDER is \"\" or \"+\". This is useful when -normalizing the folder for the \"folders\" command which displays +normalizing the folder for the `folders' command which displays the directories in / if passed \"+\". This is usually not desired. If this argument is non-nil, then EMPTY-STRING-OKAY has no effect." @@ -515,7 +515,7 @@ they will not be returned." ;; folder is specified, ensure it is nil to avoid adding the ;; folder to the folder-list and adding a slash to it. (when folder - (setq folder (mh-replace-regexp-in-string "^\+" "" folder)) + (setq folder (mh-replace-regexp-in-string "^\\+" "" folder)) (setq folder (mh-replace-regexp-in-string "/+$" "" folder)) (if (equal folder "") (setq folder nil))) @@ -653,7 +653,7 @@ with \"+\"." ;;;###mh-autoload (defun mh-expand-file-name (filename &optional default) "Expand FILENAME like `expand-file-name', but also handle MH folder names. -Any filename that starts with '+' is treated as a folder name. +Any filename that starts with `+' is treated as a folder name. See `expand-file-name' for description of DEFAULT." (if (mh-folder-name-p filename) (expand-file-name (substring filename 1) mh-user-path) |