[Emacs-commit] emacs/lisp/mh-e mh-letter.el ChangeLog

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/04/25 21:41:13

Modified files:
        lisp/mh-e      : mh-letter.el ChangeLog 

Log message:
        (mh-folder-expand-at-point): Fix folder completion. Folders returned
        by mh-folder-completion-function no longer need adornment (closes SF
        #1476270).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-letter.el.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.213&tr2=1.214&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.213 emacs/lisp/mh-e/ChangeLog:1.214
--- emacs/lisp/mh-e/ChangeLog:1.213     Fri Apr 21 21:59:54 2006
+++ emacs/lisp/mh-e/ChangeLog   Tue Apr 25 21:41:13 2006
@@ -1,3 +1,9 @@
+2006-04-25  Bill Wohler  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mh-e.el (Version, mh-version): Add +cvs to version.
Index: emacs/lisp/mh-e/mh-letter.el
diff -u emacs/lisp/mh-e/mh-letter.el:1.14 emacs/lisp/mh-e/mh-letter.el:1.15
--- emacs/lisp/mh-e/mh-letter.el:1.14   Fri Apr 21 17:49:00 2006
+++ emacs/lisp/mh-e/mh-letter.el        Tue Apr 25 21:41:13 2006
@@ -866,15 +866,12 @@
   "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