From: Bill Wohler Date: Tue, 25 Apr 2006 21:41:13 +0000 (+0000) Subject: (mh-folder-expand-at-point): Fix folder completion. Folders returned X-Git-Tag: emacs-pretest-22.0.90~2961 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a7250d806dadd555a9a22c42b0bb51c73327dba;p=emacs.git (mh-folder-expand-at-point): Fix folder completion. Folders returned by mh-folder-completion-function no longer need adornment (closes SF #1476270). --- diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index d46e842a97b..41cb3521a11 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,9 @@ +2006-04-25 Bill Wohler + + * mh-letter.el (mh-folder-expand-at-point): Fix folder completion. + Folders returned by mh-folder-completion-function no longer need + adornment (closes SF #1476270). + 2006-04-21 Bill Wohler * mh-e.el (Version, mh-version): Add +cvs to version. 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