Merge from emacs-23 branch

1 files changed, 34 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45140762c0c..767780d6938 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2010-03-31  Bernhard Herzog  <bh@intevation.de>  (tiny change)
+
+        * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930).
+
+2010-03-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xdisp.c (note_mouse_highlight): Don't do highlight if pointer is
+        invisible (Bug#5766).
+
+2010-03-31  Adrian Robert  <adrian.b.robert@gmail.com>
+
+        * xdisp.c (x_consider_frame_title, update_window_cursor): Remove
+        HAVE_NS conditionals.
+        (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited.
+
+        * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use
+        filename for the title.
+        (ns_set_doc_edited): Do nothing if the selected window is a
+        minibuffer window.
+
+        * nsterm.h: Add prototypes for ns_set_name_as_filename and
+        ns_set_doc_edited.
+
+        * nsterm.m: Remove unneeded prototype.
+
+2010-03-31  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
+        in the DOC file.  (Bug#5336)
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).
+
 2010-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (keys_of_window): Remove redundant/overridden bindings.