*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8592e138e28be8b16d97cd3987e935a457f258c5..b601cd036f168754adf04b865b1e49296c778fbc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-20  Juri Linkov  <juri@jurta.org>
+
+       * tooltip.el (tooltip): Move defgroup before define-minor-mode.
+       (tooltip-x-offset, tooltip-y-offset): Doc fix.
+
+       * menu-bar.el (menu-bar-menu-frame-live-and-visible-p)
+       (menu-bar-non-minibuffer-window-p): Instead of checking
+       display-multi-frame-p, use selected-frame when menu-updating-frame
+       is nil.
+
 2005-12-20  Davis Herring  <herring@lanl.gov>  (tiny change)
 
        * align.el (align-rules-list): Use [ \t] instead of \s-

diff --git a/man/ChangeLog b/man/ChangeLog
index e724f24167cb24682ca4a64a87f0a829ca9cd36a..2c68beb84a32bdd8eb7c677a4d5e1240d91ac043 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-20  Juri Linkov  <juri@jurta.org>
+
+       * files.texi (VC Status): Put P and N near p and n.
+
 2005-12-20  Carsten Dominik  <dominik@science.uva.nl>
 
        * org.texi: (Tags): Boolean logic documented.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2356851886cd51d30c645e6b3f3bcd649a22e308..969f9f6c46d5ec9394563af5057c576285ed5525 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-12-20  Juri Linkov  <juri@jurta.org>
+
+       * xmenu.c (Fx_popup_menu): Set Vmenu_updating_frame to f if
+       position is non-nil, else set it to nil.
+
+       * macmenu.c (Fx_popup_menu): Add `else' to set
+       Vmenu_updating_frame to nil only if position is nil.
+
+       * w32menu.c (Fx_popup_menu): Add `else' to set
+       Vmenu_updating_frame to nil only if position is nil.
+
 2005-12-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * keyboard.c (make_lispy_event): Drag-and-drop items are now