summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/dired.el11
3 files changed, 19 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 577017607cc..7cf55ec24cc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -792,6 +792,7 @@ in Emacs 24.1:
**** `special-display-buffer-names'
**** `special-display-function'
**** `display-buffer-function'
+**** `dired-shrink-to-fit'
** Time
---
@@ -856,6 +857,7 @@ See the "Face Attributes" section of the Elisp manual.
*** `buffer-has-markers-at'
*** `macro-declaration-function' (use `macro-declarations-alist').
*** `window-system-version'
+*** `dired-pop-to-buffer' (use `dired-mark-pop-up')
* Changes in Emacs 24.3 on non-free operating systems
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a29ca51033d..160bcbd45c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-04 Juri Linkov <juri@jurta.org>
+
+ * dired.el (dired-shrink-to-fit): Declare obsolete. (Bug#1806)
+ (dired-pop-to-buffer): Declare obsolete.
+ (dired-mark-pop-up): Doc fix.
+
2012-10-04 Fabián Ezequiel Gallina <fgallina@cuca>
Allow user to set docstring style for fill-paragraph.
@@ -347,7 +353,7 @@
2012-09-30 Juri Linkov <juri@jurta.org>
* arc-mode.el (archive-summarize): Let-bind `buffer-file-truename'
- to nil around the call to `add-text-properties' to prevent
+ to nil around the call to `insert' to prevent
directory time modification by lock_file. (Bug#2295)
* tar-mode.el (tar-summarize-buffer): Idem.
diff --git a/lisp/dired.el b/lisp/dired.el
index 8cb3902161a..a17e1805339 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -248,6 +248,10 @@ This is what the do-commands look for, and what the mark-commands store.")
;; I see no reason ever to make this nil -- rms.
;; (> baud-rate search-slow-speed)
"Non-nil means Dired shrinks the display buffer to fit the marked files.")
+(make-obsolete-variable 'dired-shrink-to-fit
+ "use the Customization interface to add a new rule
+to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\",
+action argument symbol is `window-height' and its value is nil." "24.3")
(defvar dired-file-version-alist)
@@ -1877,7 +1881,6 @@ for more info):
`dired-listing-switches'
`dired-trivial-filenames'
- `dired-shrink-to-fit'
`dired-marker-char'
`dired-del-marker'
`dired-keep-marker-rename'
@@ -2940,6 +2943,7 @@ or \"* [3 files]\"."
(defun dired-pop-to-buffer (buf)
"Pop up buffer BUF in a way suitable for Dired."
+ (declare (obsolete dired-mark-pop-up "24.3"))
(let ((split-window-preferred-function
(lambda (window)
(or (and (let ((split-height-threshold 0))
@@ -2981,6 +2985,11 @@ BUFFER-OR-NAME; the default name being \" *Marked Files*\". The
window is not shown if there is just one file, `dired-no-confirm'
is t, or OP-SYMBOL is a member of the list in `dired-no-confirm'.
+By default, Dired shrinks the display buffer to fit the marked files.
+To disable this, use the Customization interface to add a new rule
+to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\",
+action argument symbol is `window-height' and its value is nil.
+
FILES is the list of marked files. It can also be (t FILENAME)
in the case of one marked file, to distinguish that from using
just the current file.