Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

project-switch-project: Use a different fix for bug#58784

Browse source 
* lisp/progmodes/project.el (project-current-inhibit-prompt):
Rename to 'project-current-directory-override', and make it a
string value.
(project-current): Refer to it.
(project-switch-project): Bind it.  Drop the temp buffer (bug#58784).
This commit is contained in:
Dmitry Gutov 2022-11-24 04:33:01 +02:00
parent f8b410f4a1
commit b37604c263
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/progmodes/project.el
View file

@ -175,8 +175,14 @@ function; the only practical limitation is to use values that
`cl-defmethod' can dispatch on, like a cons cell, or a list, or a
CL struct.")
(defvar project-current-inhibit-prompt nil
"Non-nil to skip prompting the user in `project-current'.")
(define-obsolete-variable-alias
'project-current-inhibit-prompt
'project-current-directory-override
"29.1")
(defvar project-current-directory-override nil
"Value to use instead of `default-directory' when detecting the project.
When it is non-nil, `project-current' will always skip prompting too.")
;;;###autoload
(defun project-current (&optional maybe-prompt directory)
@ -195,11 +201,12 @@ ignored (per `project-ignores').
See the doc string of `project-find-functions' for the general form
of the project instance object."
(unless directory (setq directory default-directory))
(unless directory (setq directory (or project-current-directory-override
default-directory)))
(let ((pr (project--find-in-directory directory)))
(cond
(pr)
((unless project-current-inhibit-prompt
((unless project-current-directory-override
maybe-prompt)
(setq directory (project-prompt-project-dir)
pr (project--find-in-directory directory))))
@ -1698,10 +1705,8 @@ to directory DIR."
(let ((command (if (symbolp project-switch-commands)
project-switch-commands
(project--switch-project-command))))
(with-temp-buffer
(let ((default-directory dir)
(project-current-inhibit-prompt t))
(call-interactively command)))))
(let ((project-current-directory-override dir))
(call-interactively command))))
(provide 'project)
;;; project.el ends here