[Emacs-diffs] /srv/bzr/emacs/trunk r104572: Fix make_frame, introduce Vtemp_buffer_show_specifiers, cleanup doc-strings.

[martin rudalics]

------------------------------------------------------------
revno: 104572
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-12 12:16:46 +0200
message:
  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.
modified:
  src/ChangeLog
  src/frame.c
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-12 03:59:59 +0000
+++ b/src/ChangeLog     2011-06-12 10:16:46 +0000
@@ -1,3 +1,16 @@
+2011-06-12  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix minor problems found by GCC 4.6.0 static checking.

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-06-11 21:31:32 +0000
+++ b/src/frame.c       2011-06-12 10:16:46 +0000
@@ -370,7 +370,7 @@
     /* 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

=== modified file 'src/window.c'
--- a/src/window.c      2011-06-11 21:31:32 +0000
+++ b/src/window.c      2011-06-12 10:16:46 +0000
@@ -3224,7 +3224,10 @@
     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 @@
 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 @@
   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