Make dired-default-directory obsolete.

As far as I can tell, it was never used outside of dired-smart-shell-command.
It doesn't seem worth keeping around as a separate function.

* lisp/dired-x.el (dired-default-directory-alist, dired-default-directory):
Mark as obsolete.
(dired-smart-shell-command): Just call dired-current-directory.

* doc/misc/dired-x.texi (Multiple Dired Directories): Remove mentions
of dired-default-directory-alist and dired-default-directory.
Move dired-smart-shell-command here...
(Miscellaneous Commands): ... from here.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b50dafb62ee0287617f4375fb86eed2a7190be17..9f1f48aec1f85118fcb14d6f66fe378c0107895c 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-02  Glenn Morris  <rgm@gnu.org>
+
+       * dired-x.texi (Multiple Dired Directories): Remove mentions
+       of dired-default-directory-alist and dired-default-directory.
+       Move dired-smart-shell-command here...
+       (Miscellaneous Commands): ... from here.
+
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * texinfo.tex: Update to version 2011-02-24.09.

diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index dba99d9c6c7927454dd4c0a67fd3080a44025513..eb79778992240c0376f8c8ac7542d8c303c7d87b 100644 (file)
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -867,24 +867,12 @@ some commands it is appropriate that they use the current Dired
 directory instead of @code{default-directory}, e.g., @code{find-file} and
 @code{compile}.
 
-A general mechanism is provided for special handling of the working
-directory in special major modes:
-
-@table @code
-@item dired-default-directory-alist
-@vindex dired-default-directory-alist
-Default: @code{((dired-mode . (dired-current-directory)))}
-
-Alist of major modes and their notion of @code{default-directory}, as a
-Lisp expression to evaluate.  A resulting value of @code{nil} is ignored
-in favor of @code{default-directory}.
-
-@item dired-default-directory
-@findex dired-default-directory
-Use this function like you would use the variable
-@code{default-directory}, except that @code{dired-default-directory}
-also consults the variable @code{dired-default-directory-alist}.
-@end table
+@findex dired-smart-shell-command
+@findex shell-command
+@kindex M-!
+The command @code{dired-smart-shell-command}, bound to @kbd{M-!} in
+Dired buffers, is like @code{shell-command}, but it runs with
+@code{default-directory} bound to the current Dired directory.
 
 @node Find File At Point, Miscellaneous Commands, Multiple Dired Directories, Top
 @section Find File At Point
@@ -993,12 +981,6 @@ inserted subdirectories.
 @end table
 
 @table @code
-@item dired-smart-shell-command
-@findex dired-smart-shell-command
-@findex shell-command
-@kindex M-!
-Like function @code{shell-command}, but in the current Dired directory.
-Bound to @kbd{M-!} in Dired buffers.
 
 @item dired-jump
 @findex dired-jump

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4534cde3dcf52a40dda63ea0d43a0bef17719b45..744b8dd5bacc9a79b3717f2d24007d71360b52dd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-02  Glenn Morris  <rgm@gnu.org>
 
+       * dired-x.el (dired-default-directory-alist, dired-default-directory):
+       Mark as obsolete.
+       (dired-smart-shell-command): Just call dired-current-directory.
+
        * dired-x.el (dired-jump-other-window): Add autoload.
        (dired-default-directory-alist, dired-default-directory): Doc fixes.
        (dired-default-directory-alist): Mark as risky.

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index e3ba03e318e4e3d31986885a0ad0d91cfe3cd12e..a049bd00ccd60c0fd1c50fb94dcd4ffd283c5460 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -710,6 +710,8 @@ The function `dired-default-directory' evaluates EXPRESSION to
 determine a default directory.")
 
 (put 'dired-default-directory-alist 'risky-local-variable t) ; gets eval'd
+(make-obsolete-variable 'dired-default-directory-alist
+                        "this feature is due to be removed." "24.1")
 
 (defun dired-default-directory ()
   "Return the `dired-default-directory-alist' entry for the current major-mode.
@@ -717,6 +719,12 @@ If none, return `default-directory'."
   (or (eval (cdr (assq major-mode dired-default-directory-alist)))
       default-directory))
 
+;; It looks like this was intended to be something of a "general" feature,
+;; but it only ever seems to have been used in dired-smart-shell-command,
+;; and does not seem worth keeping around (?).
+(make-obsolete 'dired-default-directory
+               "this feature is due to be removed." "24.1")
+
 (defun dired-smart-shell-command (command &optional output-buffer error-buffer)
   "Like function `shell-command', but in the current Virtual Dired directory."
   (interactive
@@ -727,7 +735,9 @@ If none, return `default-directory'."
                         ((eq major-mode 'dired-mode) (dired-get-filename t t))))
     current-prefix-arg
     shell-command-default-error-buffer))
-  (let ((default-directory (dired-default-directory)))
+  (let ((default-directory (if (eq major-mode 'dired-mode)
+                               (dired-current-directory)
+                             default-directory)))
     (shell-command command output-buffer error-buffer)))
 
 \f