comparison lisp/minibuffer.el @ 94218:701d10a19a8f

(completion--file-name-table): Accept both the old `dir' or the new `pred' arg.

94217:3a71d408918b

                                       "}" table)))
      (completion-table-with-context prefix table
                                     (substring string beg)
                                     pred action))))

(defun completion--file-name-table (string dir action)
  "Internal subroutine for `read-file-name'.  Do not call this."
  (setq dir (expand-file-name dir))
  (if (and (zerop (length string)) (eq 'lambda action))
      nil                               ; FIXME: why?
    (let* ((str (condition-case nil
                    (substitute-in-file-name string)
                  (error string)))
           (name (file-name-nondirectory str))
           (specdir (file-name-directory str))
           (realdir (if specdir (expand-file-name specdir dir)

94218:701d10a19a8f

                                       "}" table)))
      (completion-table-with-context prefix table
                                     (substring string beg)
                                     pred action))))

(defun completion--file-name-table (string pred action)
  "Internal subroutine for `read-file-name'.  Do not call this."
  (if (and (zerop (length string)) (eq 'lambda action))
      nil                               ; FIXME: why?
    (let* ((dir (if (stringp pred)
                    ;; It used to be that `pred' was abused to pass `dir'
                    ;; as an argument.
                    (prog1 (expand-file-name pred) (setq pred nil))
                  default-directory))
           (str (condition-case nil
                    (substitute-in-file-name string)
                  (error string)))
           (name (file-name-nondirectory str))
           (specdir (file-name-directory str))
           (realdir (if specdir (expand-file-name specdir dir)