aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2013-12-17 18:29:11 +0100
committerMartin Rudalics2013-12-17 18:29:11 +0100
commitcf2b7efc78f0004a58b14a1eb470a306a139197d (patch)
treef662c7dfca8d066a4eb328a2b0bdc0e191021cd0
parented3af8a771c38048f075b81bc6c6fafa6dc5aff3 (diff)
downloademacs-cf2b7efc78f0004a58b14a1eb470a306a139197d.tar.gz
emacs-cf2b7efc78f0004a58b14a1eb470a306a139197d.zip
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.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/dired.el35
-rw-r--r--lisp/register.el31
3 files changed, 39 insertions, 34 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a55cf9c180d..763136cb423 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12013-12-17 Martin Rudalics <rudalics@gmx.at>
2
3 * dired.el (dired-mark-pop-up):
4 * register.el (register-preview): Don't bind
5 split-height-threshold here since it's now done in
6 display-buffer-below-selected.
7
12013-12-17 oblique <psyberbits@gmail.com> (tiny change) 82013-12-17 oblique <psyberbits@gmail.com> (tiny change)
2 9
3 * term/rxvt.el (rxvt-rgb-convert-to-16bit): Standardize with 10 * term/rxvt.el (rxvt-rgb-convert-to-16bit): Standardize with
diff --git a/lisp/dired.el b/lisp/dired.el
index afd9fbca5c2..7e96bdfb87f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3079,24 +3079,23 @@ argument or confirmation)."
3079 (apply function args) 3079 (apply function args)
3080 (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*")))) 3080 (let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*"))))
3081 (with-current-buffer buffer 3081 (with-current-buffer buffer
3082 (let ((split-height-threshold 0)) 3082 (with-temp-buffer-window
3083 (with-temp-buffer-window 3083 buffer
3084 buffer 3084 (cons 'display-buffer-below-selected
3085 (cons 'display-buffer-below-selected 3085 '((window-height . fit-window-to-buffer)))
3086 '((window-height . fit-window-to-buffer))) 3086 #'(lambda (window _value)
3087 #'(lambda (window _value) 3087 (with-selected-window window
3088 (with-selected-window window 3088 (unwind-protect
3089 (unwind-protect 3089 (apply function args)
3090 (apply function args) 3090 (when (window-live-p window)
3091 (when (window-live-p window) 3091 (quit-restore-window window 'kill)))))
3092 (quit-restore-window window 'kill))))) 3092 ;; Handle (t FILE) just like (FILE), here. That value is
3093 ;; Handle (t FILE) just like (FILE), here. That value is 3093 ;; used (only in some cases), to mean just one file that was
3094 ;; used (only in some cases), to mean just one file that was 3094 ;; marked, rather than the current line file.
3095 ;; marked, rather than the current line file. 3095 (dired-format-columns-of-files
3096 (dired-format-columns-of-files 3096 (if (eq (car files) t) (cdr files) files))
3097 (if (eq (car files) t) (cdr files) files)) 3097 (remove-text-properties (point-min) (point-max)
3098 (remove-text-properties (point-min) (point-max) 3098 '(mouse-face nil help-echo nil)))))))
3099 '(mouse-face nil help-echo nil))))))))
3100 3099
3101(defun dired-format-columns-of-files (files) 3100(defun dired-format-columns-of-files (files)
3102 (let ((beg (point))) 3101 (let ((beg (point)))
diff --git a/lisp/register.el b/lisp/register.el
index 623b1f2c0c8..cad26124fdd 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -122,22 +122,21 @@ See the documentation of the variable `register-alist' for possible VALUEs."
122 "Pop up a window to show register preview in BUFFER. 122 "Pop up a window to show register preview in BUFFER.
123If SHOW-EMPTY is non-nil show the window even if no registers." 123If SHOW-EMPTY is non-nil show the window even if no registers."
124 (when (or show-empty (consp register-alist)) 124 (when (or show-empty (consp register-alist))
125 (let ((split-height-threshold 0)) 125 (with-temp-buffer-window
126 (with-temp-buffer-window 126 buffer
127 buffer 127 (cons 'display-buffer-below-selected
128 (cons 'display-buffer-below-selected 128 '((window-height . fit-window-to-buffer)))
129 '((window-height . fit-window-to-buffer))) 129 nil
130 nil 130 (with-current-buffer standard-output
131 (with-current-buffer standard-output 131 (setq cursor-in-non-selected-windows nil)
132 (setq cursor-in-non-selected-windows nil) 132 (mapc
133 (mapc 133 (lambda (r)
134 (lambda (r) 134 (insert (or (run-hook-with-args-until-success
135 (insert (or (run-hook-with-args-until-success 135 'register-preview-functions r)
136 'register-preview-functions r) 136 (format "%s %s\n"
137 (format "%s %s\n" 137 (concat (single-key-description (car r)) ":")
138 (concat (single-key-description (car r)) ":") 138 (register-describe-oneline (car r))))))
139 (register-describe-oneline (car r)))))) 139 register-alist)))))
140 register-alist))))))
141 140
142(defun register-read-with-preview (prompt) 141(defun register-read-with-preview (prompt)
143 "Read an event with register preview using PROMPT. 142 "Read an event with register preview using PROMPT.