summaryrefslogtreecommitdiff
path: root/lisp/mh-e/mh-letter.el
diff options
context:
space:
mode:
authorBill Wohler <wohler@newt.com>2006-04-25 21:41:13 +0000
committerBill Wohler <wohler@newt.com>2006-04-25 21:41:13 +0000
commit6a7250d806dadd555a9a22c42b0bb51c73327dba (patch)
tree1554905a916b70bfa29f9132d48454f89a531e8f /lisp/mh-e/mh-letter.el
parent51d793dabf5e640839a36a87a6d937931c9744aa (diff)
downloademacs-6a7250d806dadd555a9a22c42b0bb51c73327dba.tar.gz
(mh-folder-expand-at-point): Fix folder completion. Folders returned
by mh-folder-completion-function no longer need adornment (closes SF #1476270).
Diffstat (limited to 'lisp/mh-e/mh-letter.el')
-rw-r--r--lisp/mh-e/mh-letter.el11
1 files changed, 4 insertions, 7 deletions
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 37cc8fcf31e..d037c09e2aa 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -866,15 +866,12 @@ downcasing the field name."
"Do folder name completion in Fcc header field."
(let* ((end (point))
(beg (mh-beginning-of-word))
- (folder (buffer-substring beg end))
+ (folder (buffer-substring-no-properties beg end))
(leading-plus (and (> (length folder) 0) (equal (aref folder 0) ?+)))
- (last-slash (mh-search-from-end ?/ folder))
- (prefix (and last-slash (substring folder 0 last-slash)))
- (choices (mapcar #'(lambda (x)
- (list (cond (prefix (format "%s/%s" prefix x))
- (leading-plus (format "+%s" x))
- (t x))))
+ (choices (mapcar (lambda (x) (list x))
(mh-folder-completion-function folder nil t))))
+ (unless leading-plus
+ (setq folder (concat "+" folder)))
(mh-complete-word folder choices beg end)))
;;;###mh-autoload