[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 057f934 4/4: Do not corrupt grep-find-ignored-files
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] master 057f934 4/4: Do not corrupt grep-find-ignored-files |
Date: |
Mon, 20 Jul 2015 01:53:44 +0000 |
branch: master
commit 057f93499eb0491ef816b71523242e18ae810cd5
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
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.
---
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 437c865..44a15dc 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -108,7 +108,6 @@ end it with `/'."
(cl-defmethod project-ignores ((project (head vc)))
(nconc
- (cl-call-next-method)
(let* ((dir (cdr project))
(backend (vc-responsible-backend dir)))
(mapcar
@@ -116,7 +115,8 @@ end it with `/'."
(if (string-match "\\`/" entry)
(replace-match "./" t t entry)
entry))
- (vc-call-backend backend 'ignore-completion-table dir)))))
+ (vc-call-backend backend 'ignore-completion-table dir)))
+ (cl-call-next-method)))
(defun project-ask-user (dir)
(cons 'user (read-directory-name "Project root: " dir nil t)))