[Emacs-diffs] trunk r116334: (dired-up-directory): Doc fix (bug#14848).

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116334
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14848
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 22:20:17 -0800
message:
  (dired-up-directory): Doc fix (bug#14848).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired.el                  dired.el-20091113204419-o5vbwnq5f7feedwu-482

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-08 06:16:23 +0000
+++ b/lisp/ChangeLog    2014-02-08 06:20:17 +0000
@@ -2,6 +2,7 @@
 
        * dired.el (dired-mode-map): Make :help text more accurate (bug#14893).
        (dired-prev-marked-file): Doc fix (bug#14855).
+       (dired-up-directory): Doc fix (bug#14848).
 
        * minibuffer.el (read-file-name): Doc clarification (bug#15096).
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2014-02-08 06:16:23 +0000
+++ b/lisp/dired.el     2014-02-08 06:20:17 +0000
@@ -2045,7 +2045,9 @@
 (defun dired-up-directory (&optional other-window)
   "Run Dired on parent directory of current directory.
 Find the parent directory either in this buffer or another buffer.
-Creates a buffer if necessary."
+Creates a buffer if necessary.
+If OTHER-WINDOW (the optional prefix arg), display the parent
+directory in another window."
   (interactive "P")
   (let* ((dir (dired-current-directory))
         (up (file-name-directory (directory-file-name dir))))