aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2007-03-18 02:49:54 +0000
committerNick Roberts2007-03-18 02:49:54 +0000
commit82a614d15d6cb3f77d818aecbb683c13ac02953e (patch)
tree05102bc215a58d0b4d72e2fcace6ff4030b7929b
parent92e0e0c44c7de2b35a3c7f1b72538cc0f3b4ab92 (diff)
downloademacs-82a614d15d6cb3f77d818aecbb683c13ac02953e.tar.gz
emacs-82a614d15d6cb3f77d818aecbb683c13ac02953e.zip
(compilation-find-file): Revert change
from 2006-07-18 to allow completion of directory names. Reported by John Carter <john.carter@tait.co.nz>.
-rw-r--r--lisp/progmodes/compile.el12
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3039f614fb2..aa77caf0670 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1862,17 +1862,7 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
1862 (let* ((name (read-file-name 1862 (let* ((name (read-file-name
1863 (format "Find this %s in (default %s): " 1863 (format "Find this %s in (default %s): "
1864 compilation-error filename) 1864 compilation-error filename)
1865 spec-dir filename t nil 1865 spec-dir filename t nil))
1866 ;; Try to make sure the user can only select
1867 ;; a valid answer. This predicate may be ignored,
1868 ;; tho, so we still have to double-check afterwards.
1869 ;; TODO: We should probably fix read-file-name so
1870 ;; that it never ignores this predicate, even when
1871 ;; using popup dialog boxes.
1872 (lambda (name)
1873 (if (file-directory-p name)
1874 (setq name (expand-file-name filename name)))
1875 (file-exists-p name))))
1876 (origname name)) 1866 (origname name))
1877 (cond 1867 (cond
1878 ((not (file-exists-p name)) 1868 ((not (file-exists-p name))