diff options
| author | Basil L. Contovounesios | 2020-06-26 09:37:52 +0100 |
|---|---|---|
| committer | Basil L. Contovounesios | 2020-06-26 09:37:52 +0100 |
| commit | 89c744c380b2aed28ebf2bd8f991461d60cff934 (patch) | |
| tree | 8868ffa10cb0be82d8a0f53369506e1e185ba0ed | |
| parent | be7a07f38d0bc12e3f513d8a2626ae7f8d4bb7df (diff) | |
| download | emacs-89c744c380b2aed28ebf2bd8f991461d60cff934.tar.gz emacs-89c744c380b2aed28ebf2bd8f991461d60cff934.zip | |
; Fix recent indentation in project.el
* lisp/progmodes/project.el (project-ignores, project-find-file-in)
(project-eshell, project--read-project-list): Fix indentation.
| -rw-r--r-- | lisp/progmodes/project.el | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 7e25869e286..0a15939d243 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el | |||
| @@ -449,7 +449,7 @@ backend implementation of `project-external-roots'.") | |||
| 449 | 449 | ||
| 450 | (cl-defmethod project-ignores ((project (head vc)) dir) | 450 | (cl-defmethod project-ignores ((project (head vc)) dir) |
| 451 | (let* ((root (cdr project)) | 451 | (let* ((root (cdr project)) |
| 452 | backend) | 452 | backend) |
| 453 | (append | 453 | (append |
| 454 | (when (file-equal-p dir root) | 454 | (when (file-equal-p dir root) |
| 455 | (setq backend (vc-responsible-backend root)) | 455 | (setq backend (vc-responsible-backend root)) |
| @@ -674,8 +674,8 @@ PREDICATE, HIST, and DEFAULT have the same meaning as in | |||
| 674 | (let* ((all-files (project-files project dirs)) | 674 | (let* ((all-files (project-files project dirs)) |
| 675 | (completion-ignore-case read-file-name-completion-ignore-case) | 675 | (completion-ignore-case read-file-name-completion-ignore-case) |
| 676 | (file (funcall project-read-file-name-function | 676 | (file (funcall project-read-file-name-function |
| 677 | "Find file" all-files nil nil | 677 | "Find file" all-files nil nil |
| 678 | filename))) | 678 | filename))) |
| 679 | (if (string= file "") | 679 | (if (string= file "") |
| 680 | (user-error "You didn't specify the file") | 680 | (user-error "You didn't specify the file") |
| 681 | (find-file file)))) | 681 | (find-file file)))) |
| @@ -743,10 +743,10 @@ if one already exists." | |||
| 743 | (defvar eshell-buffer-name) | 743 | (defvar eshell-buffer-name) |
| 744 | (let* ((default-directory (project-root (project-current t))) | 744 | (let* ((default-directory (project-root (project-current t))) |
| 745 | (eshell-buffer-name | 745 | (eshell-buffer-name |
| 746 | (concat "*" (file-name-nondirectory | 746 | (concat "*" (file-name-nondirectory |
| 747 | (directory-file-name | 747 | (directory-file-name |
| 748 | (file-name-directory default-directory))) | 748 | (file-name-directory default-directory))) |
| 749 | "-eshell*")) | 749 | "-eshell*")) |
| 750 | (eshell-buffer (get-buffer eshell-buffer-name))) | 750 | (eshell-buffer (get-buffer eshell-buffer-name))) |
| 751 | (if (and eshell-buffer (not current-prefix-arg)) | 751 | (if (and eshell-buffer (not current-prefix-arg)) |
| 752 | (pop-to-buffer eshell-buffer) | 752 | (pop-to-buffer eshell-buffer) |
| @@ -886,8 +886,7 @@ With some possible metadata (to be decided).") | |||
| 886 | (insert-file-contents filename) | 886 | (insert-file-contents filename) |
| 887 | (read (current-buffer))))) | 887 | (read (current-buffer))))) |
| 888 | (unless (seq-every-p | 888 | (unless (seq-every-p |
| 889 | (lambda (elt) (and (listp elt) | 889 | (lambda (elt) (stringp (car-safe elt))) |
| 890 | (stringp (car elt)))) | ||
| 891 | project--list) | 890 | project--list) |
| 892 | (warn "Contents of %s are in wrong format, resetting" | 891 | (warn "Contents of %s are in wrong format, resetting" |
| 893 | project-list-file) | 892 | project-list-file) |