aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/files.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el13
1 files changed, 4 insertions, 9 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 9270f334afa..975f78e8527 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -926,7 +926,10 @@ one or more of those symbols."
926 (logior (if (memq 'executable predicate) 1 0) 926 (logior (if (memq 'executable predicate) 1 0)
927 (if (memq 'writable predicate) 2 0) 927 (if (memq 'writable predicate) 2 0)
928 (if (memq 'readable predicate) 4 0)))) 928 (if (memq 'readable predicate) 4 0))))
929 (locate-file-internal filename path suffixes predicate)) 929 (let ((file (locate-file-internal filename path suffixes predicate)))
930 (if (and file (string-match "\\.eln\\'" file))
931 (gethash (file-name-nondirectory file) comp-eln-to-el-h)
932 file)))
930 933
931(defun locate-file-completion-table (dirs suffixes string pred action) 934(defun locate-file-completion-table (dirs suffixes string pred action)
932 "Do completion for file names passed to `locate-file'." 935 "Do completion for file names passed to `locate-file'."
@@ -985,14 +988,6 @@ one or more of those symbols."
985 (completion-table-with-context 988 (completion-table-with-context
986 string-dir names string-file pred action))))) 989 string-dir names string-file pred action)))))
987 990
988(defun locate-file-completion (string path-and-suffixes action)
989 "Do completion for file names passed to `locate-file'.
990PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
991 (declare (obsolete locate-file-completion-table "23.1"))
992 (locate-file-completion-table (car path-and-suffixes)
993 (cdr path-and-suffixes)
994 string nil action))
995
996(defvar locate-dominating-stop-dir-regexp 991(defvar locate-dominating-stop-dir-regexp
997 (purecopy "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'") 992 (purecopy "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'")
998 "Regexp of directory names that stop the search in `locate-dominating-file'. 993 "Regexp of directory names that stop the search in `locate-dominating-file'.