From: Artur Malabarba Date: Sat, 16 Jan 2016 08:52:14 +0000 (+0000) Subject: * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable X-Git-Tag: emacs-25.0.90~160 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71ecd62;p=emacs.git * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable instead of manually writing a dir-locals file. --- 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)