# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1162729261 0
# Node ID 164c2027bc0480371f828413111d083d2f49aa78
# Parent  97a25a5ed8a9446b527890baf386169669756471
*** empty log message ***

diff -r 97a25a5ed8a9 -r 164c2027bc04 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 05 12:20:12 2006 +0000
+++ b/lisp/ChangeLog	Sun Nov 05 12:21:01 2006 +0000
@@ -1,5 +1,12 @@
 2006-11-05  Martin Rudalics  <rudalics@gmx.at>
 
+	* window.el (mouse-autoselect-window-now): Remove variable.
+	(mouse-autoselect-window-state): New variable.
+	(mouse-autoselect-window-start, mouse-autoselect-window-cancel)
+	(mouse-autoselect-window-select, handle-select-window):
+	Rewritten to make mouse-autoselect-window-timer a one-shot timer.
+	Suspend delayed autoselection during menu or popup dialog.
+
 	* info-look.el (info-lookup-guess-custom-symbol): New function
 	for retrieving symbol at point in custom buffers.
 	(top level) <info-lookup-maybe-add-help>: Add backquote and
diff -r 97a25a5ed8a9 -r 164c2027bc04 src/ChangeLog
--- a/src/ChangeLog	Sun Nov 05 12:20:12 2006 +0000
+++ b/src/ChangeLog	Sun Nov 05 12:21:01 2006 +0000
@@ -1,3 +1,18 @@
+2006-11-05  Martin Rudalics  <rudalics@gmx.at>
+
+	* macmenu.c (Fmenu_or_popup_active_p): New function.
+	(syms_of_macmenu): Defsubr it.
+
+	* w32menu.c (Fmenu_or_popup_active_p): New function.
+	(syms_of_w32menu): Defsubr it.
+	(popup_activated_flag, popup_activated): Remove.
+
+	* xdisp.c (note_mouse_highlight) [HAVE_NTGUI]: Don't bother to
+	check popup_activated.
+
+	* xmenu.c (Fmenu_or_popup_active_p): New function.
+	(syms_of_xmenu): Defsubr it.
+
 2006-11-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* unexmacosx.c (malloc_cookie): Remove unused variable.