[Emacs-diffs] Changes to emacs/lisp/complete.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/23 18:39:22

Index: complete.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/complete.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- complete.el 21 Apr 2008 21:18:07 -0000      1.85
+++ complete.el 23 Apr 2008 18:39:22 -0000      1.86
@@ -491,8 +491,9 @@
       (and filename
            (let ((dir (file-name-directory str))
                  (file (file-name-nondirectory str))
-                ;; The base dir for file-completion is passed in `predicate'.
-                (default-directory (expand-file-name pred)))
+                ;; The base dir for file-completion was passed in `predicate'.
+                (default-directory (if (stringp pred) (expand-file-name pred)
+                                      default-directory)))
              (while (and (stringp dir) (not (file-directory-p dir)))
                (setq dir (directory-file-name dir))
                (setq file (concat (replace-regexp-in-string
@@ -506,8 +507,9 @@
       (and filename
           (string-match "\\*.*/" str)
           (let ((pat str)
-                ;; The base dir for file-completion is passed in `predicate'.
-                (default-directory (expand-file-name pred))
+                ;; The base dir for file-completion was passed in `predicate'.
+                (default-directory (if (stringp pred) (expand-file-name pred)
+                                      default-directory))
                 files)
             (setq p (1+ (string-match "/[^/]*\\'" pat)))
             (while (setq p (string-match PC-delim-regex pat p))
@@ -522,7 +524,8 @@
                   (while (and (setq p (cdr p))
                               (equal dir (file-name-directory (car p)))))
                   (if p
-                      (setq filename nil table nil pred nil
+                      (setq filename nil table nil
+                             pred (if (stringp pred) nil pred)
                             ambig t)
                     (delete-region beg end)
                     (setq str (concat dir (file-name-nondirectory str)))
@@ -535,7 +538,8 @@
                        ;; even if we couldn't, so remove the added
                        ;; wildcards.
                    (setq str origstr)
-                (setq filename nil table nil pred nil)))))
+                (setq filename nil table nil
+                       pred (if (stringp pred) nil pred))))))
 
       ;; Strip directory name if appropriate
       (if filename