summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStephen Leake <stephen_leake@stephe-leake.org>2019-05-19 10:28:46 -0700
committerStephen Leake <stephen_leake@stephe-leake.org>2019-05-19 10:28:46 -0700
commit2be537e6433b9b2a8d9dcb9c23493755d35d6ecc (patch)
treeb7ca668055ab7f3d3fed44c4cdfa3f6da94e8d37 /lisp
parente4eb8c850145248c1f3c4235cdd8d11b1c05bb1e (diff)
downloademacs-2be537e6433b9b2a8d9dcb9c23493755d35d6ecc.tar.gz
Minor updates to project.el
* lisp/progmodes/project.el (project-find-file): Add optional 'filename' arg. (project--completing-read-strict): Ignore 'default' set to empty string.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/project.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index cc45a71f576..e44cee2133f 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -443,14 +443,14 @@ pattern to search for."
(read-regexp "Find regexp" (and id (regexp-quote id)))))
;;;###autoload
-(defun project-find-file ()
+(defun project-find-file (&optional filename)
"Visit a file (with completion) in the current project's roots.
The completion default is the filename at point, if one is
recognized."
(interactive)
(let* ((pr (project-current t))
(dirs (project-roots pr)))
- (project-find-file-in (thing-at-point 'filename) dirs pr)))
+ (project-find-file-in (or filename (thing-at-point 'filename)) dirs pr)))
;;;###autoload
(defun project-or-external-find-file ()
@@ -522,7 +522,7 @@ PREDICATE, HIST, and DEFAULT have the same meaning as in
;; removing it when it has no matches. Neither seems natural
;; enough. Removal is confusing; early expansion makes the prompt
;; too long.
- (let* ((new-prompt (if default
+ (let* ((new-prompt (if (and default (not (string-equal default "")))
(format "%s (default %s): " prompt default)
(format "%s: " prompt)))
(res (completing-read new-prompt