Make Temp Buffer Resize Mode less intrusive (Bug#1806).

* window.c (Fsplit_window_internal): Handle only Qt value of
Vwindow_combination_limit separately.
(Qtemp_buffer_resize): New symbol.
(Vwindow_combination_limit): New default value.  Rewrite
doc-string.
* cus-start.el (window-combination-limit): Add new optional
values.
* window.el (temp-buffer-window-show)
(window--try-to-split-window): Obey new values of
window-combination-limit.
(split-window): Test window-combination-limit for t instead of
non-nil.
(display-buffer-at-bottom): New buffer display action function.
* help.el (temp-buffer-resize-regexps): New option.
(temp-buffer-resize-mode): Rewrite doc-string.
(resize-temp-buffer-window): Obey temp-buffer-resize-regexps.
Don't resize reused window.  Suggested by Glen Morris.

4 files changed, 122 insertions, 33 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f9044e4f36..f18bfd73611 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2012-09-22  Martin Rudalics  <rudalics@gmx.at>
+
+	* cus-start.el (window-combination-limit): Add new optional
+	values.
+	* window.el (temp-buffer-window-show)
+	(window--try-to-split-window): Handle new values of
+	window-combination-limit (Bug#1806).
+	(split-window): Test window-combination-limit for t instead of
+	non-nil.
+	(display-buffer-at-bottom): New buffer display action function.
+	* help.el (temp-buffer-resize-regexps): New option.
+	(temp-buffer-resize-mode): Rewrite doc-string.
+	(resize-temp-buffer-window): Obey temp-buffer-resize-regexps.
+	Don't resize reused window.  Suggested by Glen Morris.
+
 2012-09-22  Stefan Merten  <smerten@oekonux.de>
 
 	* rst.el: Revamp section title faces.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 0eb8b2d63c3..a91a479b054 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -422,7 +422,17 @@ since it could result in memory overflow and make Emacs crash."
 		       (const :tag "Only on ttys" :value tty)
 		       (other :tag "Always" t)) "23.1")
 	     (window-combination-resize windows boolean "24.1")
-	     (window-combination-limit windows boolean "24.1")
+	     (window-combination-limit
+	      windows (choice
+		       (const :tag "Never (nil)" :value nil)
+		       (const :tag "For Temp Buffer Resize mode (temp-buffer-resize)"
+			      :value temp-buffer-resize)
+		       (const :tag "For temporary buffers (temp-buffer)"
+			      :value temp-buffer)
+		       (const :tag "For buffer display (display-buffer)"
+			      :value display-buffer)
+		       (other :tag "Always (t)" :value t))
+	      "24.3")
 	     ;; xdisp.c
 	     (show-trailing-whitespace whitespace-faces boolean nil
 				       :safe booleanp)
diff --git a/lisp/help.el b/lisp/help.el
index da11389d87c..707c8e3c84f 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -990,6 +990,17 @@ window.  The height of the root window is subject to the values of
   :version "24.2"
   :group 'help)
 
+(defcustom temp-buffer-resize-regexps nil
+  "List of regexps that inhibit Temp Buffer Resize mode.
+Any window of a buffer whose name matches one of these regular
+expressions is left alone by Temp Buffer Resize mode."
+  :type '(repeat
+	  :tag "Buffer"
+	  :value ""
+	  (regexp :format "%v"))
+  :version "24.3"
+  :group 'help)
+
 (define-minor-mode temp-buffer-resize-mode
   "Toggle auto-resizing temporary buffer windows (Temp Buffer Resize Mode).
 With a prefix argument ARG, enable Temp Buffer Resize mode if ARG
@@ -1001,6 +1012,12 @@ show a temporary buffer are automatically resized in height to
 fit the buffer's contents, but never more than
 `temp-buffer-max-height' nor less than `window-min-height'.
 
+A window is resized only if it has been specially created for the
+buffer.  Windows that have shown another buffer before are not
+resized.  A window showing a buffer whose name matches any of the
+expressions in `temp-buffer-resize-regexps' is not resized.  A
+frame is resized only if `temp-buffer-resize-frames' is non-nil.
+
 This mode is used by `help', `apropos' and `completion' buffers,
 and some others."
   :global t :group 'help
@@ -1017,27 +1034,33 @@ WINDOW can be any live window and defaults to the selected one.
 Do not make WINDOW higher than `temp-buffer-max-height' nor
 smaller than `window-min-height'.  Do nothing if WINDOW is not
 vertically combined or some of its contents are scrolled out of
-view."
+view.  Do nothing if the name of WINDOW's buffer matches an
+expression in `temp-buffer-resize-regexps'."
   (setq window (window-normalize-window window t))
-  (let ((height (if (functionp temp-buffer-max-height)
-		    (with-selected-window window
-		      (funcall temp-buffer-max-height (window-buffer)))
-		  temp-buffer-max-height)))
-    (cond
-     ((and (pos-visible-in-window-p (point-min) window)
-	   (window-combined-p window))
-      (fit-window-to-buffer window height))
-     ((and temp-buffer-resize-frames
-	   (eq window (frame-root-window window))
-	   (memq (car (window-parameter window 'quit-restore))
-		 ;; If 'same is too strong, we might additionally check
-		 ;; whether the second element is 'frame.
-		 '(same frame)))
-      (let ((frame (window-frame window)))
-	(fit-frame-to-buffer
-	 frame (+ (frame-height frame)
-		  (- (window-total-size window))
-		  height)))))))
+  (let ((buffer-name (buffer-name (window-buffer window))))
+    (unless (catch 'found
+	      (dolist (regexp temp-buffer-resize-regexps)
+		(when (string-match regexp buffer-name)
+		  (throw 'found t))))
+      (let ((height (if (functionp temp-buffer-max-height)
+			(with-selected-window window
+			  (funcall temp-buffer-max-height (window-buffer)))
+		      temp-buffer-max-height))
+	    (quit-cadr (cadr (window-parameter window 'quit-restore))))
+	(cond
+	 ;; Don't resize WINDOW if it showed another buffer before.
+	 ((and (eq quit-cadr 'window)
+	       (pos-visible-in-window-p (point-min) window)
+	       (window-combined-p window))
+	  (fit-window-to-buffer window height))
+	 ((and temp-buffer-resize-frames
+	       (eq quit-cadr 'frame)
+	       (eq window (frame-root-window window)))
+	  (let ((frame (window-frame window)))
+	    (fit-frame-to-buffer
+	     frame (+ (frame-height frame)
+		      (- (window-total-size window))
+		      height)))))))))
 
 ;;; Help windows.
 (defcustom help-window-select 'other
diff --git a/lisp/window.el b/lisp/window.el
index fccb68bd94a..87817fb8773 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -111,7 +111,19 @@ to `display-buffer'."
       (set-buffer-modified-p nil)
       (setq buffer-read-only t)
       (goto-char (point-min))
-      (when (setq window (display-buffer buffer action))
+      (when (let ((window-combination-limit
+		   ;; When `window-combination-limit' equals
+		   ;; `temp-buffer' or `temp-buffer-resize' and
+		   ;; `temp-buffer-resize-mode' is enabled in this
+		   ;; buffer bind it to t so resizing steals space
+		   ;; preferably from the window that was split.
+		   (if (or (eq window-combination-limit 'temp-buffer)
+			   (and (eq window-combination-limit
+				    'temp-buffer-resize)
+				temp-buffer-resize-mode))
+		       t
+		     window-combination-limit)))
+	      (setq window (display-buffer buffer action)))
 	(setq frame (window-frame window))
 	(unless (eq frame (selected-frame))
 	  (raise-frame frame))
@@ -3678,9 +3690,8 @@ frame.  The selected window is not changed by this function."
 	 (parent (window-parent window))
 	 (function (window-parameter window 'split-window))
 	 (window-side (window-parameter window 'window-side))
-	 ;; Rebind `window-combination-limit' and
-	 ;; `window-combination-resize' since in some cases we may have
-	 ;; to override their value.
+	 ;; Rebind the following two variables since in some cases we
+	 ;; have to override their value.
 	 (window-combination-limit window-combination-limit)
 	 (window-combination-resize window-combination-resize)
 	 atom-root)
@@ -3738,7 +3749,7 @@ frame.  The selected window is not changed by this function."
 	      (and window-combination-resize
 		   (or (window-parameter window 'window-side)
 		       (not (eq window-combination-resize 'side)))
-		   (not window-combination-limit)
+		   (not (eq window-combination-limit t))
 		   ;; Resize makes sense in iso-combinations only.
 		   (window-combined-p window horizontal)))
 	     ;; `old-size' is the current size of WINDOW.
@@ -3818,7 +3829,7 @@ frame.  The selected window is not changed by this function."
 	      ;; Make new-parent non-nil if we need a new parent window;
 	      ;; either because we want to nest or because WINDOW is not
 	      ;; iso-combined.
-	      (or window-combination-limit
+	      (or (eq window-combination-limit t)
 		  (not (window-combined-p window horizontal))))
 	(setq new-normal
 	      ;; Make new-normal the normal size of the new window.
@@ -5066,12 +5077,19 @@ Return value returned by `split-window-preferred-function' if it
 represents a live window, nil otherwise."
       (and (window-live-p window)
 	   (not (frame-parameter (window-frame window) 'unsplittable))
-	   (let ((new-window
-		  ;; Since `split-window-preferred-function' might
-		  ;; throw an error use `condition-case'.
-		  (condition-case nil
-		      (funcall split-window-preferred-function window)
-		    (error nil))))
+	   (let* ((window-combination-limit
+		   ;; When `window-combination-limit' equals
+		   ;; `display-buffer' bind it to t so resizing steals
+		   ;; space preferably from the window that was split.
+		   (if (eq window-combination-limit 'display-buffer)
+		       t
+		     window-combination-limit))
+		  (new-window
+		   ;; Since `split-window-preferred-function' might
+		   ;; throw an error use `condition-case'.
+		   (condition-case nil
+		       (funcall split-window-preferred-function window)
+		     (error nil))))
 	     (and (window-live-p new-window) new-window))))
 
 (defun window--frame-usable-p (frame)
@@ -5524,6 +5542,29 @@ the selected one."
 	     (window--display-buffer
 	      buffer window 'reuse display-buffer-mark-dedicated)))))
 
+(defun display-buffer-at-bottom (buffer _alist)
+  "Try displaying BUFFER in a window at the botom of the selected frame.
+This either splits the window at the bottom of the frame or the
+frame's root window, or reuses an existing window at the bottom
+of the selected frame."
+  (let (bottom-window window)
+    (walk-window-tree (lambda (window) (setq bottom-window window)))
+    (or (and (not (frame-parameter nil 'unsplittable))
+	     (setq window (window--try-to-split-window bottom-window))
+	     (window--display-buffer
+	      buffer window 'window display-buffer-mark-dedicated))
+	(and (not (frame-parameter nil 'unsplittable))
+	     (setq window
+		   (condition-case nil
+		       (split-window (frame-root-window))
+		     (error nil)))
+	     (window--display-buffer
+	      buffer window 'window display-buffer-mark-dedicated))
+	(and (setq window bottom-window)
+	     (not (window-dedicated-p window))
+	     (window--display-buffer
+	      buffer window 'reuse display-buffer-mark-dedicated)))))
+
 (defun display-buffer-in-previous-window (buffer alist)
   "Display BUFFER in a window previously showing it.
 If ALIST has a non-nil `inhibit-same-window' entry, the selected