Changeset 3402

Timestamp:

08/14/04 10:05:02 (4 years ago)

Author:

fujii

Message:

* minibuf.c (read_minibuf): Set minibuf_selected_window on first
entry to minibuffer or on entry from a non-minibuffer window.
UNGCPRO before returning. These codes are imported from emacs CVS
HEAD.

Files:

• branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.2/src/minibuf.c (modified) (2 diffs)

branches/2.2/src/ChangeLog.Meadow

@@ +1 @@
+2004-08-14  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * minibuf.c (read_minibuf): Set minibuf_selected_window on first
+        entry to minibuffer or on entry from a non-minibuffer window.
+        UNGCPRO before returning. These codes are imported from emacs CVS
+        HEAD.
+
-2004-08-14  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.2/src/minibuf.c

@@ -402 +402 @@
-                                         expflag, histvar, histpos, defalt,
-                                         allow_props, inherit_input_method);
+      UNGCPRO;
-      return unbind_to (count, val);
-    }
@@ -503 +504 @@
-
-  Vminibuf_scroll_window = selected_window;
+  if (minibuf_level == 1 || !EQ (minibuf_window, selected_window))
+    minibuf_selected_window = selected_window;
-  Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
-  Fselect_window (minibuf_window);