upstream

6 files changed, 142 insertions, 64 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
diff --git a/src/bytecode.c b/src/bytecode.c
index 2e6ee3d4445..9c7a3fa30cf 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -58,21 +58,21 @@ by Hallvard:
 #ifdef BYTE_CODE_METER
 
 Lisp_Object Qbyte_code_meter;
-#define METER_2(code1, code2) \
-  XFASTINT (XVECTOR (XVECTOR (Vbyte_code_meter)->contents[(code1)]) \
-            ->contents[(code2)])
-
-#define METER_1(code) METER_2 (0, (code))
+#define METER_2(code1, code2) AREF (AREF (Vbyte_code_meter, code1), code2)
+#define METER_1(code) METER_2 (0, code)
 
 #define METER_CODE(last_code, this_code)                                \
 {                                                                       \
   if (byte_metering_on)                                                 \
     {                                                                   \
-      if (METER_1 (this_code) < MOST_POSITIVE_FIXNUM)                   \
-        METER_1 (this_code)++;                                          \
+      if (XFASTINT (METER_1 (this_code)) < MOST_POSITIVE_FIXNUM)        \
+        XSETFASTINT (METER_1 (this_code),                               \
+                     XFASTINT (METER_1 (this_code)) + 1);               \
       if (last_code                                                     \
-          && METER_2 (last_code, this_code) < MOST_POSITIVE_FIXNUM)     \
-        METER_2 (last_code, this_code)++;                               \
+          && (XFASTINT (METER_2 (last_code, this_code))                 \
+              < MOST_POSITIVE_FIXNUM))                                  \
+        XSETFASTINT (METER_2 (last_code, this_code),                    \
+                     XFASTINT (METER_2 (last_code, this_code)) + 1);    \
     }                                                                   \
 }
 
diff --git a/src/data.c b/src/data.c
index 4449977dbe0..2aa27e65d77 100644
--- a/src/data.c
+++ b/src/data.c
@@ -637,8 +637,9 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
     Fput (symbol, Qautoload, XCDR (function));
 
   XSYMBOL (symbol)->function = definition;
-  /* Handle automatic advice activation */
-  if (CONSP (XSYMBOL (symbol)->plist) && !NILP (Fget (symbol, Qad_advice_info)))
+  /* Handle automatic advice activation.  */
+  if (CONSP (XSYMBOL (symbol)->plist)
+      && !NILP (Fget (symbol, Qad_advice_info)))
     {
       call2 (Qad_activate_internal, symbol, Qnil);
       definition = XSYMBOL (symbol)->function;
@@ -647,11 +648,12 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
 }
 
 DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0,
-       doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION.
+       doc: /* Set SYMBOL's function definition to DEFINITION.
 Associates the function with the current load file, if any.
 The optional third argument DOCSTRING specifies the documentation string
 for SYMBOL; if it is omitted or nil, SYMBOL uses the documentation string
-determined by DEFINITION.  */)
+determined by DEFINITION.
+The return value is undefined.  */)
   (register Lisp_Object symbol, Lisp_Object definition, Lisp_Object docstring)
 {
   CHECK_SYMBOL (symbol);
@@ -666,7 +668,10 @@ determined by DEFINITION.  */)
   LOADHIST_ATTACH (Fcons (Qdefun, symbol));
   if (!NILP (docstring))
     Fput (symbol, Qfunction_documentation, docstring);
-  return definition;
+  /* We used to return `definition', but now that `defun' and `defmacro' expand
+     to a call to `defalias', we return `symbol' for backward compatibility
+     (bug#11686).  */
+  return symbol;
 }
 
 DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0,
diff --git a/src/frame.c b/src/frame.c
index 39d26ded5a6..fc52b07923d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -630,8 +630,8 @@ DEFUN ("make-terminal-frame", Fmake_terminal_frame, Smake_terminal_frame,
        doc: /* Create an additional terminal frame, possibly on another terminal.
 This function takes one argument, an alist specifying frame parameters.
 
-You can create multiple frames on a single text-only terminal, but
-only one of them (the selected terminal frame) is actually displayed.
+You can create multiple frames on a single text terminal, but only one
+of them (the selected terminal frame) is actually displayed.
 
 In practice, generally you don't need to specify any parameters,
 except when you want to create a new frame on another terminal.
@@ -865,8 +865,8 @@ something to select a different frame, or until the next time
 this function is called.  If you are using a window system, the
 previously selected frame may be restored as the selected frame
 when returning to the command loop, because it still may have
-the window system's input focus.  On a text-only terminal, the
-next redisplay will display FRAME.
+the window system's input focus.  On a text terminal, the next
+redisplay will display FRAME.
 
 This function returns FRAME, or nil if FRAME has been deleted.  */)
   (Lisp_Object frame, Lisp_Object norecord)
@@ -1254,7 +1254,17 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
           FOR_EACH_FRAME (tail, frame1)
             {
               if (! EQ (frame, frame1) && FRAME_LIVE_P (XFRAME (frame1)))
-                break;
+                {
+                  /* Do not change a text terminal's top-frame.  */
+                  struct frame *f1 = XFRAME (frame1);
+                  if (FRAME_TERMCAP_P (f1) || FRAME_MSDOS_P (f1))
+                    {
+                      Lisp_Object top_frame = FRAME_TTY (f1)->top_frame;
+                      if (!EQ (top_frame, frame))
+                        frame1 = top_frame;
+                    }
+                  break;
+                }
             }
         }
 #ifdef NS_IMPL_COCOA
@@ -1730,8 +1740,8 @@ usually not displayed at all, even in a window system's \"taskbar\".
 Normally you may not make FRAME invisible if all other frames are invisible,
 but if the second optional argument FORCE is non-nil, you may do so.
 
-This function has no effect on text-only terminal frames.  Such frames
-are always considered visible, whether or not they are currently being
+This function has no effect on text terminal frames.  Such frames are
+always considered visible, whether or not they are currently being
 displayed in the terminal.  */)
   (Lisp_Object frame, Lisp_Object force)
 {
@@ -1743,12 +1753,6 @@ displayed in the terminal.  */)
   if (NILP (force) && !other_visible_frames (XFRAME (frame)))
     error ("Attempt to make invisible the sole visible or iconified frame");
 
-#if 0 /* This isn't logically necessary, and it can do GC.  */
-  /* Don't let the frame remain selected.  */
-  if (EQ (frame, selected_frame))
-    do_switch_frame (next_frame (frame, Qt), 0, 0, Qnil)
-#endif
-
   /* Don't allow minibuf_window to remain on a deleted frame.  */
   if (EQ (XFRAME (frame)->minibuffer_window, minibuf_window))
     {
@@ -1816,7 +1820,7 @@ Return nil if FRAME was made invisible, via `make-frame-invisible'.
 On graphical displays, invisible frames are not updated and are
 usually not displayed at all, even in a window system's \"taskbar\".
 
-If FRAME is a text-only terminal frame, this always returns t.
+If FRAME is a text terminal frame, this always returns t.
 Such frames are always considered visible, whether or not they are
 currently being displayed on the terminal.  */)
   (Lisp_Object frame)
@@ -1872,7 +1876,7 @@ doesn't support multiple overlapping frames, this function selects FRAME.  */)
   f = XFRAME (frame);
 
   if (FRAME_TERMCAP_P (f))
-    /* On a text-only terminal select FRAME.  */
+    /* On a text terminal select FRAME.  */
     Fselect_frame (frame, Qnil);
   else
     /* Do like the documentation says. */
@@ -2493,7 +2497,7 @@ not the menu bar).
 In a graphical version with no toolkit, it includes both the tool bar
 and menu bar.
 
-For a text-only terminal, it includes the menu bar.  In this case, the
+For a text terminal, it includes the menu bar.  In this case, the
 result is really in characters rather than pixels (i.e., is identical
 to `frame-height'). */)
   (Lisp_Object frame)
diff --git a/src/term.c b/src/term.c
index 3a41552c02e..5f807181199 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2132,7 +2132,7 @@ DEFUN ("tty-display-color-p", Ftty_display_color_p, Stty_display_color_p,
 
 TERMINAL can be a terminal object, a frame, or nil (meaning the
 selected frame's terminal).  This function always returns nil if
-TERMINAL does not refer to a text-only terminal.  */)
+TERMINAL does not refer to a text terminal.  */)
   (Lisp_Object terminal)
 {
   struct terminal *t = get_tty_terminal (terminal, 0);
@@ -2149,7 +2149,7 @@ DEFUN ("tty-display-color-cells", Ftty_display_color_cells,
 
 TERMINAL can be a terminal object, a frame, or nil (meaning the
 selected frame's terminal).  This function always returns 0 if
-TERMINAL does not refer to a text-only terminal.  */)
+TERMINAL does not refer to a text terminal.  */)
   (Lisp_Object terminal)
 {
   struct terminal *t = get_tty_terminal (terminal, 0);
@@ -2371,7 +2371,7 @@ no effect if used on a non-tty terminal.
 
 TERMINAL can be a terminal object, a frame or nil (meaning the
 selected frame's terminal).  This function always returns nil if
-TERMINAL does not refer to a text-only terminal.  */)
+TERMINAL does not refer to a text terminal.  */)
   (Lisp_Object terminal)
 {
   struct terminal *t = get_terminal (terminal, 1);
@@ -2381,6 +2381,21 @@ TERMINAL does not refer to a text-only terminal.  */)
   return Qnil;
 }
 
+DEFUN ("tty-top-frame", Ftty_top_frame, Stty_top_frame, 0, 1, 0,
+       doc: /* Return the topmost terminal frame on TERMINAL.
+TERMINAL can be a terminal object, a frame or nil (meaning the
+selected frame's terminal).  This function returns nil if TERMINAL
+does not refer to a text terminal.  Otherwise, it returns the
+top-most frame on the text terminal.  */)
+  (Lisp_Object terminal)
+{
+  struct terminal *t = get_terminal (terminal, 1);
+
+  if (t->type == output_termcap)
+    return t->display_info.tty->top_frame;
+  return Qnil;
+}
+
 
 
 DEFUN ("suspend-tty", Fsuspend_tty, Ssuspend_tty, 0, 1, 0,
@@ -3638,6 +3653,7 @@ bigger, or it may make it blink, or it may do nothing at all.  */);
   defsubr (&Stty_no_underline);
   defsubr (&Stty_type);
   defsubr (&Scontrolling_tty_p);
+  defsubr (&Stty_top_frame);
   defsubr (&Ssuspend_tty);
   defsubr (&Sresume_tty);
 #ifdef HAVE_GPM
diff --git a/src/xdisp.c b/src/xdisp.c
index 1353b4e1184..87e079f8ab1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8410,9 +8410,9 @@ move_it_in_display_line_to (struct it *it,
                           /* On graphical terminals, newlines may
                              "overflow" into the fringe if
                              overflow-newline-into-fringe is non-nil.
-                             On text-only terminals, newlines may
-                             overflow into the last glyph on the
-                             display line.*/
+                             On text terminals, newlines may overflow
+                             into the last glyph on the display
+                             line.*/
                           if (!FRAME_WINDOW_P (it->f)
                               || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
@@ -10875,7 +10875,8 @@ static Lisp_Object mode_line_string_face_prop;
 static Lisp_Object Vmode_line_unwind_vector;
 
 static Lisp_Object
-format_mode_line_unwind_data (struct buffer *obuf,
+format_mode_line_unwind_data (struct frame *target_frame,
+                              struct buffer *obuf,
                               Lisp_Object owin,
                               int save_proptrans)
 {
@@ -10887,7 +10888,7 @@ format_mode_line_unwind_data (struct buffer *obuf,
   Vmode_line_unwind_vector = Qnil;
 
   if (NILP (vector))
-    vector = Fmake_vector (make_number (8), Qnil);
+    vector = Fmake_vector (make_number (10), Qnil);
 
   ASET (vector, 0, make_number (mode_line_target));
   ASET (vector, 1, make_number (MODE_LINE_NOPROP_LEN (0)));
@@ -10902,6 +10903,15 @@ format_mode_line_unwind_data (struct buffer *obuf,
     tmp = Qnil;
   ASET (vector, 6, tmp);
   ASET (vector, 7, owin);
+  if (target_frame)
+    {
+      /* Similarly to `with-selected-window', if the operation selects
+         a window on another frame, we must restore that frame's
+         selected window, and (for a tty) the top-frame.  */
+      ASET (vector, 8, target_frame->selected_window);
+      if (FRAME_TERMCAP_P (target_frame))
+        ASET (vector, 9, FRAME_TTY (target_frame)->top_frame);
+    }
 
   return vector;
 }
@@ -10909,6 +10919,10 @@ format_mode_line_unwind_data (struct buffer *obuf,
 static Lisp_Object
 unwind_format_mode_line (Lisp_Object vector)
 {
+  Lisp_Object old_window = AREF (vector, 7);
+  Lisp_Object target_frame_window = AREF (vector, 8);
+  Lisp_Object old_top_frame = AREF (vector, 9);
+
   mode_line_target = XINT (AREF (vector, 0));
   mode_line_noprop_ptr = mode_line_noprop_buf + XINT (AREF (vector, 1));
   mode_line_string_list = AREF (vector, 2);
@@ -10917,9 +10931,26 @@ unwind_format_mode_line (Lisp_Object vector)
   mode_line_string_face = AREF (vector, 4);
   mode_line_string_face_prop = AREF (vector, 5);
 
-  if (!NILP (AREF (vector, 7)))
-    /* Select window before buffer, since it may change the buffer.  */
-    Fselect_window (AREF (vector, 7), Qt);
+  /* Select window before buffer, since it may change the buffer.  */
+  if (!NILP (old_window))
+    {
+      /* If the operation that we are unwinding had selected a window
+         on a different frame, reset its frame-selected-window.  For a
+         text terminal, reset its top-frame if necessary.  */
+      if (!NILP (target_frame_window))
+        {
+          Lisp_Object frame
+            = WINDOW_FRAME (XWINDOW (target_frame_window));
+
+          if (!EQ (frame, WINDOW_FRAME (XWINDOW (old_window))))
+            Fselect_window (target_frame_window, Qt);
+
+          if (!NILP (old_top_frame) && !EQ (old_top_frame, frame))
+            Fselect_frame (old_top_frame, Qt);
+        }
+
+      Fselect_window (old_window, Qt);
+    }
 
   if (!NILP (AREF (vector, 6)))
     {
@@ -10990,8 +11021,6 @@ store_mode_line_noprop (const char *string, int field_width, int precision)
                              Frame Titles
  ***********************************************************************/
 
-#ifdef HAVE_WINDOW_SYSTEM
-
 /* Set the title of FRAME, if it has changed.  The title format is
    Vicon_title_format if FRAME is iconified, otherwise it is
    frame_title_format.  */
@@ -11035,7 +11064,7 @@ x_consider_frame_title (Lisp_Object frame)
          mode_line_noprop_buf; then display the title.  */
       record_unwind_protect (unwind_format_mode_line,
                              format_mode_line_unwind_data
-                                (current_buffer, selected_window, 0));
+                               (f, current_buffer, selected_window, 0));
 
       Fselect_window (f->selected_window, Qt);
       set_buffer_internal_1 (XBUFFER (XWINDOW (f->selected_window)->buffer));
@@ -11062,10 +11091,6 @@ x_consider_frame_title (Lisp_Object frame)
     }
 }
 
-#endif /* not HAVE_WINDOW_SYSTEM */
-
-
-
 
 /***********************************************************************
                               Menu Bars
@@ -11092,7 +11117,6 @@ prepare_menu_bars (void)
   /* Update all frame titles based on their buffer names, etc.  We do
      this before the menu bars so that the buffer-menu will show the
      up-to-date frame titles.  */
-#ifdef HAVE_WINDOW_SYSTEM
   if (windows_or_buffers_changed || update_mode_lines)
     {
       Lisp_Object tail, frame;
@@ -11105,7 +11129,6 @@ prepare_menu_bars (void)
             x_consider_frame_title (frame);
         }
     }
-#endif /* HAVE_WINDOW_SYSTEM */
 
   /* Update the menu bar item lists, if appropriate.  This has to be
      done before any actual redisplay or generation of display lines.  */
@@ -20230,7 +20253,7 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   it.paragraph_embedding = L2R;
 
   record_unwind_protect (unwind_format_mode_line,
-                         format_mode_line_unwind_data (NULL, Qnil, 0));
+                         format_mode_line_unwind_data (NULL, NULL, Qnil, 0));
 
   mode_line_target = MODE_LINE_DISPLAY;
 
@@ -20931,7 +20954,8 @@ are the selected window and the WINDOW's buffer).  */)
      and set that to nil so that we don't alter the outer value.  */
   record_unwind_protect (unwind_format_mode_line,
                          format_mode_line_unwind_data
-                             (old_buffer, selected_window, 1));
+                           (XFRAME (WINDOW_FRAME (XWINDOW (window))),
+                            old_buffer, selected_window, 1));
   mode_line_proptrans_alist = Qnil;
 
   Fselect_window (window, Qt);