[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115569: Remove no more needed bindings of split-hei
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] trunk r115569: Remove no more needed bindings of split-height-threshold. |
Date: |
Tue, 17 Dec 2013 17:29:29 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115569
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-17 18:29:11 +0100
message:
Remove no more needed bindings of split-height-threshold.
* dired.el (dired-mark-pop-up):
* register.el (register-preview): Don't bind
split-height-threshold here since it's now done in
display-buffer-below-selected.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
lisp/register.el register.el-20091113204419-o5vbwnq5f7feedwu-104
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-17 16:03:23 +0000
+++ b/lisp/ChangeLog 2013-12-17 17:29:11 +0000
@@ -1,3 +1,10 @@
+2013-12-17 Martin Rudalics <address@hidden>
+
+ * dired.el (dired-mark-pop-up):
+ * register.el (register-preview): Don't bind
+ split-height-threshold here since it's now done in
+ display-buffer-below-selected.
+
2013-12-17 oblique <address@hidden> (tiny change)
* term/rxvt.el (rxvt-rgb-convert-to-16bit): Standardize with
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2013-12-11 00:11:26 +0000
+++ b/lisp/dired.el 2013-12-17 17:29:11 +0000
@@ -3079,24 +3079,23 @@
(apply function args)
(let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*"))))
(with-current-buffer buffer
- (let ((split-height-threshold 0))
- (with-temp-buffer-window
- buffer
- (cons 'display-buffer-below-selected
- '((window-height . fit-window-to-buffer)))
- #'(lambda (window _value)
- (with-selected-window window
- (unwind-protect
- (apply function args)
- (when (window-live-p window)
- (quit-restore-window window 'kill)))))
- ;; Handle (t FILE) just like (FILE), here. That value is
- ;; used (only in some cases), to mean just one file that was
- ;; marked, rather than the current line file.
- (dired-format-columns-of-files
- (if (eq (car files) t) (cdr files) files))
- (remove-text-properties (point-min) (point-max)
- '(mouse-face nil help-echo nil))))))))
+ (with-temp-buffer-window
+ buffer
+ (cons 'display-buffer-below-selected
+ '((window-height . fit-window-to-buffer)))
+ #'(lambda (window _value)
+ (with-selected-window window
+ (unwind-protect
+ (apply function args)
+ (when (window-live-p window)
+ (quit-restore-window window 'kill)))))
+ ;; Handle (t FILE) just like (FILE), here. That value is
+ ;; used (only in some cases), to mean just one file that was
+ ;; marked, rather than the current line file.
+ (dired-format-columns-of-files
+ (if (eq (car files) t) (cdr files) files))
+ (remove-text-properties (point-min) (point-max)
+ '(mouse-face nil help-echo nil)))))))
(defun dired-format-columns-of-files (files)
(let ((beg (point)))
=== modified file 'lisp/register.el'
--- a/lisp/register.el 2013-12-08 04:20:50 +0000
+++ b/lisp/register.el 2013-12-17 17:29:11 +0000
@@ -122,22 +122,21 @@
"Pop up a window to show register preview in BUFFER.
If SHOW-EMPTY is non-nil show the window even if no registers."
(when (or show-empty (consp register-alist))
- (let ((split-height-threshold 0))
- (with-temp-buffer-window
- buffer
- (cons 'display-buffer-below-selected
- '((window-height . fit-window-to-buffer)))
- nil
- (with-current-buffer standard-output
- (setq cursor-in-non-selected-windows nil)
- (mapc
- (lambda (r)
- (insert (or (run-hook-with-args-until-success
- 'register-preview-functions r)
- (format "%s %s\n"
- (concat (single-key-description (car r)) ":")
- (register-describe-oneline (car r))))))
- register-alist))))))
+ (with-temp-buffer-window
+ buffer
+ (cons 'display-buffer-below-selected
+ '((window-height . fit-window-to-buffer)))
+ nil
+ (with-current-buffer standard-output
+ (setq cursor-in-non-selected-windows nil)
+ (mapc
+ (lambda (r)
+ (insert (or (run-hook-with-args-until-success
+ 'register-preview-functions r)
+ (format "%s %s\n"
+ (concat (single-key-description (car r)) ":")
+ (register-describe-oneline (car r))))))
+ register-alist)))))
(defun register-read-with-preview (prompt)
"Read an event with register preview using PROMPT.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115569: Remove no more needed bindings of split-height-threshold.,
Martin Rudalics <=