dired-x trivia.

* lisp/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/ChangeLog b/lisp/ChangeLog
index 1f1dbf6..4534cde 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-03-02  Glenn Morris  <rgm@gnu.org>
 
+       * 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.
+
        * dired-x.el (dired-omit-here-always): Make it obsolete.
 
 2011-03-02  Chong Yidong  <cyd@stupidchicken.com>

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 81f77b4..e3ba03e 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -436,6 +436,7 @@ move to its line in dired."
                 (dired-omit-mode)
                 (dired-goto-file file)))))))
 
+;;;###autoload
 (defun dired-jump-other-window (&optional file-name)
   "Like \\[dired-jump] (`dired-jump') but in other window."
   (interactive
@@ -704,12 +705,15 @@ Also useful for `auto-mode-alist' like this:
                       (dired-current-directory)
                     default-directory)))
   "Alist of major modes and their opinion on `default-directory'.
-This is given as a Lisp expression to evaluate.  A resulting value of
-nil is ignored in favor of `default-directory'.")
+Each element has the form (MAJOR . EXPRESSION).
+The function `dired-default-directory' evaluates EXPRESSION to
+determine a default directory.")
+
+(put 'dired-default-directory-alist 'risky-local-variable t) ; gets eval'd
 
 (defun dired-default-directory ()
-  "Usage like variable `default-directory'.
-Knows about the special cases in variable `dired-default-directory-alist'."
+  "Return the `dired-default-directory-alist' entry for the current major-mode.
+If none, return `default-directory'."
   (or (eval (cdr (assq major-mode dired-default-directory-alist)))
       default-directory))