summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorArtur Malabarba <bruce.connor.am@gmail.com>2016-01-16 08:52:14 +0000
committerArtur Malabarba <bruce.connor.am@gmail.com>2016-01-16 08:53:33 +0000
commit71ecd62937b4645504a75043205c70ae020e6cb8 (patch)
treed20feac6244b735315b9ce2512889f2cf8ed9f69 /lisp
parentf0b82b34536e6bafbecbd642eee0cb0f534f8647 (diff)
downloademacs-71ecd62937b4645504a75043205c70ae020e6cb8.tar.gz
* lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
instead of manually writing a dir-locals file.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/dired-x.el14
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index fd8290ee65c..dccaa9e96ca 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -816,16 +816,14 @@ If in a Dired buffer, reverts it."
(interactive)
(if (file-exists-p dired-local-variables-file)
(error "Old-style dired-local-variables-file `./%s' found;
-replace it with a dir-locals-file `./%s'"
+replace it with a dir-locals-file `./%s.el'"
dired-local-variables-file
dir-locals-file))
- (if (file-exists-p dir-locals-file)
- (message "File `./%s' already exists." dir-locals-file)
- (with-temp-buffer
- (insert "\
-\((dired-mode . ((subdirs . nil)
- (dired-omit-mode . t))))\n")
- (write-file dir-locals-file))
+ (if (dir-locals--all-files default-directory)
+ (message "File `./%s' already exists."
+ (car (dir-locals--all-files default-directory)))
+ (add-dir-local-variable 'dired-mode 'subdirs nil)
+ (add-dir-local-variable 'dired-mode 'dired-omit-mode t)
;; Run extra-hooks and revert directory.
(when (derived-mode-p 'dired-mode)
(hack-dir-local-variables-non-file-buffer)