From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Nov 2006 12:21:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.91~331
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=107709d449c2488ccb802f59449391b25aab6dc6;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bb302eb566..5d1136a945f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 20e26952b17..f40fe219b10 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.