upstream

1 files changed, 41 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9a239de5b99..16fcbb07522 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,37 @@
+2012-06-19  Chong Yidong  <cyd@gnu.org>
+
+        * frame.c (delete_frame): When selecting a frame on a different
+        text terminal, do not alter the terminal's top-frame.
+
+        * xdisp.c (format_mode_line_unwind_data): Record the target
+        frame's selected window and its terminal's top-frame.
+        (unwind_format_mode_line): Restore them.
+        (x_consider_frame_title, display_mode_line, Fformat_mode_line):
+        Callers changed.
+        (x_consider_frame_title): Do not condition on HAVE_WINDOW_SYSTEM,
+        since tty frames can be explicitly named.
+        (prepare_menu_bars): Likewise.
+
+        * term.c (Ftty_top_frame): New function.
+
+2012-06-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port byte-code-meter to modern targets.
+        * bytecode.c (METER_CODE) [BYTE_CODE_METER]: Don't assume
+        !CHECK_LISP_OBJECT_TYPE && !USE_LSB_TAG.  Problem with
+        CHECK_LISP_OBJECT_TYPE reported by Dmitry Andropov in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-06/msg00282.html>.
+        (METER_1, METER_2): Simplify.
+
+2012-06-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * data.c (Fdefalias): Return `symbol' (bug#11686).
+
 2012-06-18  Martin Rudalics  <rudalics@gmx.at>
 
         * buffer.c (Fkill_buffer): Don't throw an error when the buffer
-        gets killed during executing of this function (Bug#11665).  Try
-        to always return Qt when the buffer has been actually killed.
+        gets killed during executing of this function (Bug#11665).
+        Try to always return Qt when the buffer has been actually killed.
         (Vkill_buffer_query_functions): In doc-string say that functions
         run by this hook should not change the current buffer.
 
@@ -56,8 +85,8 @@
         (x_draw_glyph_string): Use them.
         * xfaces.c (Qline, Qwave): New Lisp objects.
         (check_lface_attrs, merge_face_ref)
-        (Finternal_set_lisp_face_attribute, realize_x_face): Handle
-        wave-style underline face attributes.
+        (Finternal_set_lisp_face_attribute, realize_x_face):
+        Handle wave-style underline face attributes.
         * xterm.c (x_draw_underwave): New function.
         (x_draw_glyph_string): Use it.
 
@@ -130,8 +159,8 @@
 
 2012-06-16  Eli Zaretskii  <eliz@gnu.org>
 
-        * xdisp.c (set_cursor_from_row): Don't dereference glyphs_end.  If
-        all the glyphs of the glyph row came from strings, and we have no
+        * xdisp.c (set_cursor_from_row): Don't dereference glyphs_end.
+        If all the glyphs of the glyph row came from strings, and we have no
         cursor positioning clues, put the cursor on the first glyph of the
         row.
         (handle_face_prop): Use chunk-relative overlay string index when
@@ -164,8 +193,8 @@
         Simplify under the assumption that USE_2_TAGS_FOR_INTS is defined.
         (INTTYPEBITS): New macro, for clarity.
         (INTMASK, MOST_POSITIVE_FIXNUM): Use it.
-        (LISP_INT1_TAG, LISP_STRING_TAG, LISP_INT_TAG_P): Simplify
-        now that USE_LSB_TAG is always defined.
+        (LISP_INT1_TAG, LISP_STRING_TAG, LISP_INT_TAG_P):
+        Simplify now that USE_LSB_TAG is always defined.
         (TYPEMASK, XINT) [USE_LSB_TAG]: Remove unnecessary cast.
         (make_number) [!USE_LSB_TAG]: Use INTMASK; that's simpler.
 
@@ -183,11 +212,11 @@
         * lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct
         instead of union.
         (XLI, XIL): Define.
-        (XHASH, XTYPE, XINT, XUINT, make_number, XSET, XPNTR, XUNTAG): Use
-        them.
-        * emacs.c (gdb_use_struct): Renamed from gdb_use_union.
+        (XHASH, XTYPE, XINT, XUINT, make_number, XSET, XPNTR, XUNTAG):
+        Use them.
+        * emacs.c (gdb_use_struct): Rename from gdb_use_union.
         * .gdbinit: Check gdb_use_struct instead of gdb_use_union.
-        * alloc.c (widen_to_Lisp_Object): Removed.
+        * alloc.c (widen_to_Lisp_Object): Remove.
         (mark_memory): Use XIL instead of widen_to_Lisp_Object.
         * frame.c (delete_frame): Remove outdated comment.
         * w32fns.c (Fw32_register_hot_key): Use XLI instead of checking