emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r109795: In Fset_window_configuration


From: martin rudalics
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r109795: In Fset_window_configuration revert first part of last change.
Date: Mon, 27 Aug 2012 23:07:32 +0200
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 109795
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2012-08-27 23:07:32 +0200
message:
  In Fset_window_configuration revert first part of last change.
  
  * window.c (Fset_window_configuration): Revert first part of
  last change.
modified:
  src/ChangeLog
  src/window.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-27 18:53:10 +0000
+++ b/src/ChangeLog     2012-08-27 21:07:32 +0000
@@ -1,3 +1,8 @@
+2012-08-27  Martin Rudalics  <address@hidden>
+
+       * window.c (Fset_window_configuration): Revert first part of
+       last change.
+
 2012-08-27  Jan Djärv  <address@hidden>
 
        * nsterm.h (NSPanel): New class variable dialog_return.

=== modified file 'src/window.c'
--- a/src/window.c      2012-08-27 08:31:19 +0000
+++ b/src/window.c      2012-08-27 21:07:32 +0000
@@ -5616,24 +5616,6 @@
       int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
       int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
 
-      /* Don't do this within the main loop below: This may call Lisp
-        code and is thus potentially unsafe while input is blocked.  */
-      for (k = 0; k < saved_windows->header.size; k++)
-       {
-         p = SAVED_WINDOW_N (saved_windows, k);
-         window = p->window;
-         w = XWINDOW (window);
-
-         if (!NILP (p->buffer)
-             && ((!EQ (w->buffer, p->buffer)
-                  && !NILP (BVAR (XBUFFER (p->buffer), name)))
-                 || NILP (w->buffer)
-                 || NILP (BVAR (XBUFFER (w->buffer), name))))
-           /* Record old buffer of window when its buffer is going to
-              change.  */
-           call1 (Qrecord_window_buffer, window);
-       }
-
       /* The mouse highlighting code could get screwed up
         if it runs during this.  */
       BLOCK_INPUT;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]