Remove handling of auto-buffer-name window parameter.

* window.c (Fset_window_configuration): Remove handling of
auto-buffer-name window parameter.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1040b93..4bde0cf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-28  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.c (Fset_window_configuration): Remove handling of
+       auto-buffer-name window parameter.
+
 2012-08-28  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Do not allow to set major mode for a dead buffer.

diff --git a/src/window.c b/src/window.c
index ba1ec25..070cc23 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -62,7 +62,7 @@ static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
 static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;
 static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
 static Lisp_Object Qsafe, Qabove, Qbelow;
-static Lisp_Object Qauto_buffer_name, Qclone_of;
+static Lisp_Object Qclone_of;
 
 static int displayed_window_lines (struct window *);
 static int count_windows (struct window *);
@@ -5540,7 +5540,6 @@ the return value is nil.  Otherwise the value is t.  */)
   struct Lisp_Vector *saved_windows;
   Lisp_Object new_current_buffer;
   Lisp_Object frame;
-  Lisp_Object auto_buffer_name;
   FRAME_PTR f;
   ptrdiff_t old_point = -1;
 
@@ -5794,18 +5793,6 @@ the return value is nil.  Otherwise the value is t.  */)
                    BUF_PT_BYTE (XBUFFER (w->buffer)));
               w->start_at_line_beg = 1;
             }
-          else if (STRINGP (auto_buffer_name =
-                            Fwindow_parameter (window, Qauto_buffer_name))
-                   && SCHARS (auto_buffer_name) != 0
-                   && (wset_buffer (w, Fget_buffer_create (auto_buffer_name)),
-                       !NILP (w->buffer)))
-           {
-             set_marker_restricted (w->start,
-                                    make_number (0), w->buffer);
-             set_marker_restricted (w->pointm,
-                                    make_number (0), w->buffer);
-             w->start_at_line_beg = 1;
-           }
          else
            /* Window has no live buffer, get one.  */
            {
@@ -6711,7 +6698,6 @@ syms_of_window (void)
   DEFSYM (Qtemp_buffer_show_hook, "temp-buffer-show-hook");
   DEFSYM (Qabove, "above");
   DEFSYM (Qbelow, "below");
-  DEFSYM (Qauto_buffer_name, "auto-buffer-name");
   DEFSYM (Qclone_of, "clone-of");
 
   staticpro (&Vwindow_list);