diff options
| author | Glenn Morris | 2011-03-01 20:13:57 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-03-01 20:13:57 -0800 |
| commit | 8889f4e2c332b0ecedc9e6088252f4cbae301236 (patch) | |
| tree | 43fe75fe9c9c0b9bcea96fc7a0780a52406c89ff | |
| parent | d77aaf6f83896eef355c71b5596c6806528f595e (diff) | |
| download | emacs-8889f4e2c332b0ecedc9e6088252f4cbae301236.tar.gz emacs-8889f4e2c332b0ecedc9e6088252f4cbae301236.zip | |
Make dired-omit-here-always obsolete, in favor of standard function.
* lisp/dired-x.el (dired-omit-here-always): Make it obsolete.
* doc/misc/dired-x.texi (Omitting Variables): Refer to add-dir-local-variable
instead of the obsoleted dired-omit-here-always.
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/dired-x.texi | 13 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/dired-x.el | 4 |
4 files changed, 14 insertions, 12 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2ce67bad6cb..47ae7ee3842 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * dired-x.texi (Omitting Variables): Refer to add-dir-local-variable | ||
| 4 | instead of the obsoleted dired-omit-here-always. | ||
| 5 | |||
| 1 | 2011-02-28 Michael Albinus <michael.albinus@gmx.de> | 6 | 2011-02-28 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * tramp.texi (Frequently Asked Questions): Add Emacs 24 to | 8 | * tramp.texi (Frequently Asked Questions): Add Emacs 24 to |
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index cde39ff6a62..dba99d9c6c7 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi | |||
| @@ -345,17 +345,8 @@ a directory local setting | |||
| 345 | @end example | 345 | @end example |
| 346 | 346 | ||
| 347 | @noindent | 347 | @noindent |
| 348 | to a @file{.dir-locals.el} file in that directory. | 348 | to a @file{.dir-locals.el} file in that directory. You can use the |
| 349 | 349 | command @code{add-dir-local-variable} to do this. | |
| 350 | @table @code | ||
| 351 | @findex dired-omit-here-always | ||
| 352 | @item dired-omit-here-always | ||
| 353 | |||
| 354 | This is an interactive function that creates a local variables file exactly | ||
| 355 | like the example above (if it does not already exist) in the | ||
| 356 | @code{dir-locals-file} file in the current directory and then refreshes | ||
| 357 | the directory listing. | ||
| 358 | @end table | ||
| 359 | 350 | ||
| 360 | @vindex dired-omit-files | 351 | @vindex dired-omit-files |
| 361 | @item dired-omit-files | 352 | @item dired-omit-files |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a75520f08b7..1f1dbf69fe5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * dired-x.el (dired-omit-here-always): Make it obsolete. | ||
| 4 | |||
| 1 | 2011-03-02 Chong Yidong <cyd@stupidchicken.com> | 5 | 2011-03-02 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * textmodes/artist.el (artist-curr-go): Default to pen-line. | 7 | * textmodes/artist.el (artist-curr-go): Default to pen-line. |
diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 9941c7a0db5..81f77b48289 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el | |||
| @@ -785,7 +785,7 @@ See also `dired-enable-local-variables'." | |||
| 785 | (make-obsolete 'dired-hack-local-variables | 785 | (make-obsolete 'dired-hack-local-variables |
| 786 | 'hack-dir-local-variables-non-file-buffer "24.1") | 786 | 'hack-dir-local-variables-non-file-buffer "24.1") |
| 787 | 787 | ||
| 788 | ;; Not sure this is worth having a dedicated command for... | 788 | ;; Does not seem worth a dedicated command. |
| 789 | ;; See the more general features in files-x.el. | 789 | ;; See the more general features in files-x.el. |
| 790 | (defun dired-omit-here-always () | 790 | (defun dired-omit-here-always () |
| 791 | "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'. | 791 | "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'. |
| @@ -809,6 +809,8 @@ replace it with a dir-locals-file `./%s'" | |||
| 809 | (dired-extra-startup) | 809 | (dired-extra-startup) |
| 810 | (dired-revert)))) | 810 | (dired-revert)))) |
| 811 | 811 | ||
| 812 | (make-obsolete 'dired-omit-here-always 'add-dir-local-variable "24.1") | ||
| 813 | |||
| 812 | 814 | ||
| 813 | ;;; GUESS SHELL COMMAND. | 815 | ;;; GUESS SHELL COMMAND. |
| 814 | 816 | ||