diff options
| author | Dmitry Gutov | 2020-05-18 03:44:26 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2020-05-18 03:45:38 +0300 |
| commit | 2216468786f64cfa403dface1dab1cd20b84d5aa (patch) | |
| tree | 0bbd30d437aa267f7e1f2493961a5d235a150be2 | |
| parent | 30e8d560aac0442cfcbd6c88f616227a5e67743c (diff) | |
| download | emacs-2216468786f64cfa403dface1dab1cd20b84d5aa.tar.gz emacs-2216468786f64cfa403dface1dab1cd20b84d5aa.zip | |
Update the package version
* lisp/progmodes/project.el: Update the package version.
(project-vc-merge-submodules): Update the docstring.
(project-try-vc): Add a FIXME.
| -rw-r--r-- | lisp/progmodes/project.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 0b2761c2a5e..44259990bbf 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; project.el --- Operations on the current project -*- lexical-binding: t; -*- | 1 | ;;; project.el --- Operations on the current project -*- lexical-binding: t; -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2015-2020 Free Software Foundation, Inc. |
| 4 | ;; Version: 0.1.3 | 4 | ;; Version: 0.2.0 |
| 5 | ;; Package-Requires: ((emacs "26.3")) | 5 | ;; Package-Requires: ((emacs "26.3")) |
| 6 | 6 | ||
| 7 | ;; This is a GNU ELPA :core package. Avoid using functionality that | 7 | ;; This is a GNU ELPA :core package. Avoid using functionality that |
| @@ -233,7 +233,10 @@ to find the list of ignores for each directory." | |||
| 233 | :safe 'listp) | 233 | :safe 'listp) |
| 234 | 234 | ||
| 235 | (defcustom project-vc-merge-submodules t | 235 | (defcustom project-vc-merge-submodules t |
| 236 | "Non-nil to consider submodules part of the parent project." | 236 | "Non-nil to consider submodules part of the parent project. |
| 237 | |||
| 238 | After changing this variable (using Customize or .dir-locals.el) | ||
| 239 | you might have to restart Emacs to see the effect." | ||
| 237 | :type 'boolean | 240 | :type 'boolean |
| 238 | :package-version '(project . "0.2.0") | 241 | :package-version '(project . "0.2.0") |
| 239 | :safe 'booleanp) | 242 | :safe 'booleanp) |
| @@ -284,6 +287,8 @@ backend implementation of `project-external-roots'.") | |||
| 284 | (vc-file-setprop | 287 | (vc-file-setprop |
| 285 | dir 'project-git-root | 288 | dir 'project-git-root |
| 286 | (if (and | 289 | (if (and |
| 290 | ;; FIXME: Invalidate the cache when the value | ||
| 291 | ;; of this variable changes. | ||
| 287 | project-vc-merge-submodules | 292 | project-vc-merge-submodules |
| 288 | (project--submodule-p root)) | 293 | (project--submodule-p root)) |
| 289 | (let* ((parent (file-name-directory | 294 | (let* ((parent (file-name-directory |
| @@ -302,9 +307,8 @@ backend implementation of `project-external-roots'.") | |||
| 302 | ;; there is the custom var now. | 307 | ;; there is the custom var now. |
| 303 | ;; | 308 | ;; |
| 304 | ;; Some users may also set up things equivalent to Git submodules | 309 | ;; Some users may also set up things equivalent to Git submodules |
| 305 | ;; using "git worktree" instead (for example). However, we expect | 310 | ;; using "git worktree" (for example). However, we expect that most |
| 306 | ;; that most of them would prefer to treat those as separate | 311 | ;; of them would prefer to treat those as separate projects anyway. |
| 307 | ;; projects anyway. | ||
| 308 | (let* ((gitfile (expand-file-name ".git" root))) | 312 | (let* ((gitfile (expand-file-name ".git" root))) |
| 309 | (cond | 313 | (cond |
| 310 | ((file-directory-p gitfile) | 314 | ((file-directory-p gitfile) |