diff options
| author | Dmitry Gutov | 2015-07-20 04:42:53 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-07-20 04:42:53 +0300 |
| commit | 057f93499eb0491ef816b71523242e18ae810cd5 (patch) | |
| tree | 843c9c4daa0347b664155fd3f226cf1c04747881 | |
| parent | 5330a45ebff0214cc5c5d123e7cc68f00f68ff39 (diff) | |
| download | emacs-057f93499eb0491ef816b71523242e18ae810cd5.tar.gz emacs-057f93499eb0491ef816b71523242e18ae810cd5.zip | |
Do not corrupt grep-find-ignored-files
* lisp/progmodes/project.el (project-ignores): Change the order of
the arguments to nconc, in order not to corrupt grep-find-ignored-files.
| -rw-r--r-- | lisp/progmodes/project.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 437c865dc08..44a15dc5917 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el | |||
| @@ -108,7 +108,6 @@ end it with `/'." | |||
| 108 | 108 | ||
| 109 | (cl-defmethod project-ignores ((project (head vc))) | 109 | (cl-defmethod project-ignores ((project (head vc))) |
| 110 | (nconc | 110 | (nconc |
| 111 | (cl-call-next-method) | ||
| 112 | (let* ((dir (cdr project)) | 111 | (let* ((dir (cdr project)) |
| 113 | (backend (vc-responsible-backend dir))) | 112 | (backend (vc-responsible-backend dir))) |
| 114 | (mapcar | 113 | (mapcar |
| @@ -116,7 +115,8 @@ end it with `/'." | |||
| 116 | (if (string-match "\\`/" entry) | 115 | (if (string-match "\\`/" entry) |
| 117 | (replace-match "./" t t entry) | 116 | (replace-match "./" t t entry) |
| 118 | entry)) | 117 | entry)) |
| 119 | (vc-call-backend backend 'ignore-completion-table dir))))) | 118 | (vc-call-backend backend 'ignore-completion-table dir))) |
| 119 | (cl-call-next-method))) | ||
| 120 | 120 | ||
| 121 | (defun project-ask-user (dir) | 121 | (defun project-ask-user (dir) |
| 122 | (cons 'user (read-directory-name "Project root: " dir nil t))) | 122 | (cons 'user (read-directory-name "Project root: " dir nil t))) |