From: Glenn Morris <rgm@gnu.org>
Date: Wed, 2 Mar 2011 17:12:43 +0000 (-0800)
Subject: Fix previous dired-x.el change.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~76
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbb17c4e2a2a6283647cb7be5b1169d572ef417a;p=emacs.git

Fix previous dired-x.el change.
---

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 94398687d11..d71212e5dcb 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -735,9 +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 (if (eq major-mode 'dired-mode)
-                               (dired-current-directory)
-                             default-directory)))
+  (let ((default-directory (or (and (eq major-mode 'dired-mode)
+                                    (dired-current-directory))
+                               default-directory)))
     (shell-command command output-buffer error-buffer)))