Commit cf2b7efc authored by Martin Rudalics's avatar Martin Rudalics

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.
parent ed3af8a7
2013-12-17 Martin Rudalics <rudalics@gmx.at>
* 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 <psyberbits@gmail.com> (tiny change) 2013-12-17 oblique <psyberbits@gmail.com> (tiny change)
* term/rxvt.el (rxvt-rgb-convert-to-16bit): Standardize with * term/rxvt.el (rxvt-rgb-convert-to-16bit): Standardize with
......
...@@ -3079,24 +3079,23 @@ argument or confirmation)." ...@@ -3079,24 +3079,23 @@ argument or confirmation)."
(apply function args) (apply function args)
(let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*")))) (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*"))))
(with-current-buffer buffer (with-current-buffer buffer
(let ((split-height-threshold 0)) (with-temp-buffer-window
(with-temp-buffer-window buffer
buffer (cons 'display-buffer-below-selected
(cons 'display-buffer-below-selected '((window-height . fit-window-to-buffer)))
'((window-height . fit-window-to-buffer))) #'(lambda (window _value)
#'(lambda (window _value) (with-selected-window window
(with-selected-window window (unwind-protect
(unwind-protect (apply function args)
(apply function args) (when (window-live-p window)
(when (window-live-p window) (quit-restore-window window 'kill)))))
(quit-restore-window window 'kill))))) ;; Handle (t FILE) just like (FILE), here. That value is
;; Handle (t FILE) just like (FILE), here. That value is ;; used (only in some cases), to mean just one file that was
;; used (only in some cases), to mean just one file that was ;; marked, rather than the current line file.
;; marked, rather than the current line file. (dired-format-columns-of-files
(dired-format-columns-of-files (if (eq (car files) t) (cdr files) files))
(if (eq (car files) t) (cdr files) files)) (remove-text-properties (point-min) (point-max)
(remove-text-properties (point-min) (point-max) '(mouse-face nil help-echo nil)))))))
'(mouse-face nil help-echo nil))))))))
(defun dired-format-columns-of-files (files) (defun dired-format-columns-of-files (files)
(let ((beg (point))) (let ((beg (point)))
......
...@@ -122,22 +122,21 @@ See the documentation of the variable `register-alist' for possible VALUEs." ...@@ -122,22 +122,21 @@ See the documentation of the variable `register-alist' for possible VALUEs."
"Pop up a window to show register preview in BUFFER. "Pop up a window to show register preview in BUFFER.
If SHOW-EMPTY is non-nil show the window even if no registers." If SHOW-EMPTY is non-nil show the window even if no registers."
(when (or show-empty (consp register-alist)) (when (or show-empty (consp register-alist))
(let ((split-height-threshold 0)) (with-temp-buffer-window
(with-temp-buffer-window buffer
buffer (cons 'display-buffer-below-selected
(cons 'display-buffer-below-selected '((window-height . fit-window-to-buffer)))
'((window-height . fit-window-to-buffer))) nil
nil (with-current-buffer standard-output
(with-current-buffer standard-output (setq cursor-in-non-selected-windows nil)
(setq cursor-in-non-selected-windows nil) (mapc
(mapc (lambda (r)
(lambda (r) (insert (or (run-hook-with-args-until-success
(insert (or (run-hook-with-args-until-success 'register-preview-functions r)
'register-preview-functions r) (format "%s %s\n"
(format "%s %s\n" (concat (single-key-description (car r)) ":")
(concat (single-key-description (car r)) ":") (register-describe-oneline (car r))))))
(register-describe-oneline (car r)))))) register-alist)))))
register-alist))))))
(defun register-read-with-preview (prompt) (defun register-read-with-preview (prompt)
"Read an event with register preview using PROMPT. "Read an event with register preview using PROMPT.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment