From: Martin Rudalics <rudalics@gmx.at>
Date: Sun, 12 Jun 2011 10:16:46 +0000 (+0200)
Subject: Fix make_frame, introduce Vtemp_buffer_show_specifiers, cleanup doc-strings.
X-Git-Tag: emacs-pretest-24.0.90~104^2~575
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e10ac9f13ab251789fd0232ea10259a0110d4a45;p=emacs.git

Fix make_frame, introduce Vtemp_buffer_show_specifiers, cleanup doc-strings.

* frame.c (make_frame): Call other_buffer_safely instead of
other_buffer.

* window.c (temp_output_buffer_show): Call display_buffer with
second argument Vtemp_buffer_show_specifiers and reset latter
immediately after the call.
(Vtemp_buffer_show_specifiers): New variable.
(auto_window_vscroll_p, next_screen_context_lines)
(Vscroll_preserve_screen_position): Remove leading asterisks from
doc-strings.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 51b7b863ff0..15b6bf6baf2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-12  Martin Rudalics  <rudalics@gmx.at>
+
+	* frame.c (make_frame): Call other_buffer_safely instead of
+	other_buffer.
+
+	* window.c (temp_output_buffer_show): Call display_buffer with
+	second argument Vtemp_buffer_show_specifiers and reset latter
+	immediately after the call.
+	(Vtemp_buffer_show_specifiers): New variable.
+	(auto_window_vscroll_p, next_screen_context_lines)
+	(Vscroll_preserve_screen_position): Remove leading asterisks from
+	doc-strings.
+
 2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix minor problems found by GCC 4.6.0 static checking.
diff --git a/src/frame.c b/src/frame.c
index 66e0078d382..34474417efa 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -370,7 +370,7 @@ make_frame (int mini_p)
     /* If buf is a 'hidden' buffer (i.e. one whose name starts with
        a space), try to find another one.  */
     if (SREF (Fbuffer_name (buf), 0) == ' ')
-      buf = Fother_buffer (buf, Qnil, Qnil);
+      buf = other_buffer_safely (buf);
 
     /* Use set_window_buffer, not Fset_window_buffer, and don't let
        hooks be run by it.  The reason is that the whole frame/window
diff --git a/src/window.c b/src/window.c
index 4345a13ea59..65df9f26e64 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3224,7 +3224,10 @@ temp_output_buffer_show (register Lisp_Object buf)
     call1 (Vtemp_buffer_show_function, buf);
   else
     {
-      window = display_buffer (buf, Qnil, Qnil);
+      window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil);
+      /* Reset Vtemp_buffer_show_specifiers immediately so it won't
+	 affect subsequent calls.  */
+      Vtemp_buffer_show_specifiers = Qnil;
 
       if (!EQ (XWINDOW (window)->frame, selected_frame))
 	Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
@@ -6520,6 +6523,16 @@ If this function is used, then it must do the entire job of showing
 the buffer; `temp-buffer-show-hook' is not run unless this function runs it.  */);
   Vtemp_buffer_show_function = Qnil;
 
+  DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers,
+	       doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'.
+These specifiers are passed by `with-output-to-temp-buffer' as second
+argument to `display-buffer'.  Applications should only let-bind this
+around a call to `with-output-to-temp-buffer'.
+
+For a description of buffer display specifiers see the variable
+`display-buffer-alist'.  */);
+  Vtemp_buffer_show_specifiers = Qnil;
+
   DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window,
 	       doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll.  */);
   Vminibuf_scroll_window = Qnil;
@@ -6535,16 +6548,16 @@ is displayed in the `mode-line' face.  */);
   Vother_window_scroll_buffer = Qnil;
 
   DEFVAR_BOOL ("auto-window-vscroll", auto_window_vscroll_p,
-	       doc: /* *Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
+	       doc: /* Non-nil means to automatically adjust `window-vscroll' to view tall lines.  */);
   auto_window_vscroll_p = 1;
 
   DEFVAR_INT ("next-screen-context-lines", next_screen_context_lines,
-	      doc: /* *Number of lines of continuity when scrolling by screenfuls.  */);
+	      doc: /* Number of lines of continuity when scrolling by screenfuls.  */);
   next_screen_context_lines = 2;
 
   DEFVAR_LISP ("scroll-preserve-screen-position",
 	       Vscroll_preserve_screen_position,
-	       doc: /* *Controls if scroll commands move point to keep its screen position unchanged.
+	       doc: /* Controls if scroll commands move point to keep its screen position unchanged.
 A value of nil means point does not keep its screen position except
 at the scroll margin or window boundary respectively.
 A value of t means point keeps its screen position if the scroll