11 files changed, 92 insertions, 57 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ef57223b9ca..1ec148b30c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2012-03-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
+
+2012-03-12  Chong Yidong  <cyd@gnu.org>
+
+        * eval.c (inhibit_lisp_code): Rename from
+        inhibit_window_configuration_change_hook; move from window.c.
+
+        * xfns.c (unwind_create_frame_1, Fx_create_frame):
+        * window.c (run_window_configuration_change_hook)
+        (syms_of_window): Callers changed.
+
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * keymap.c (Fkey_description): Doc fix (Bug#9700).
+
+        * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452).
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * frame.c (other_visible_frames): Don't assume the selected frame
+        is visible (Bug#10955).
+
+2012-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (compare_overlays): Avoid qsort's instability (bug#6830).
+
+2012-03-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (x_wm_set_size_hint): Use one row in call to
+        FRAME_TEXT_LINES_TO_PIXEL_HEIGHT so base_height is greater than
+        zero (Bug#10954).
+
 2012-03-03  Glenn Morris  <rgm@gnu.org>
 
         * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.
@@ -195,8 +229,8 @@
 
 2012-02-04  Eli Zaretskii  <eliz@gnu.org>
 
-        * w32.c (get_emacs_configuration_options): Include
-        --enable-checking, if specified, in the return value.
+        * w32.c (get_emacs_configuration_options):
+        Include --enable-checking, if specified, in the return value.
 
 2012-02-04  Martin Rudalics  <rudalics@gmx.at>
 
@@ -302,8 +336,8 @@
 2012-01-19  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (save_window_save, Fcurrent_window_configuration)
-        (Vwindow_persistent_parameters): Do not use Qstate.  Rewrite
-        doc-strings.
+        (Vwindow_persistent_parameters): Do not use Qstate.
+        Rewrite doc-strings.
 
 2012-01-19  Kenichi Handa  <handa@m17n.org>
 
@@ -477,9 +511,9 @@
         * nsselect.m (CUT_BUFFER_SUPPORT): Remove define.
         (symbol_to_nsstring): Fix indentation.
         (ns_symbol_to_pb): New function.
-        (Fns_get_selection_internal): Renamed from Fns_get_cut_buffer_internal.
-        (Fns_rotate_cut_buffers_internal): Removed.
-        (Fns_store_selection_internal): Renamed from
+        (Fns_get_selection_internal): Rename from Fns_get_cut_buffer_internal.
+        (Fns_rotate_cut_buffers_internal): Remove.
+        (Fns_store_selection_internal): Rename from
         Fns_store_cut_buffer_internal.
         (ns_get_foreign_selection, Fx_own_selection_internal)
         (Fx_disown_selection_internal, Fx_selection_exists_p)
@@ -620,7 +654,7 @@
         (coding_set_destination): Return how many bytes
         coding->destination was relocated.
         (CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET)
-        (CODING_CHAR_CHARSET_P): Adjusted for the avove changes.
+        (CODING_CHAR_CHARSET_P): Adjust for the avove changes.
 
 2011-12-05  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
diff --git a/src/buffer.c b/src/buffer.c
index 1577254d92a..1fea19b0d65 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2864,6 +2864,12 @@ compare_overlays (const void *v1, const void *v2)
     return s1->beg < s2->beg ? -1 : 1;
   if (s1->end != s2->end)
     return s2->end < s1->end ? -1 : 1;
+  /* Avoid the non-determinism of qsort by choosing an arbitrary ordering
+     between "equal" overlays.  The result can still change between
+     invocations of Emacs, but it won't change in the middle of
+     `find_field' (bug#6830).  */
+  if (XHASH (s1->overlay) != XHASH (s2->overlay))
+    return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
   return 0;
 }
 
diff --git a/src/editfns.c b/src/editfns.c
index bbeb5033664..a41565d8588 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -663,10 +663,11 @@ is after LIMIT, then LIMIT will be returned instead.  */)
 
 DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
        doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
-
 A field is a region of text with the same `field' property.
-If NEW-POS is nil, then the current point is used instead, and set to the
-constrained position if that is different.
+
+If NEW-POS is nil, then use the current point instead, and move point
+to the resulting constrained position, in addition to returning that
+position.
 
 If OLD-POS is at the boundary of two fields, then the allowable
 positions for NEW-POS depends on the value of the optional argument
diff --git a/src/eval.c b/src/eval.c
index 344228741cb..4a3f5083b3b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -124,6 +124,12 @@ Lisp_Object Vsignaling_function;
 
 int handling_signal;
 
+/* If non-nil, Lisp code must not be run since some part of Emacs is
+   in an inconsistent state.  Currently, x-create-frame uses this to
+   avoid triggering window-configuration-change-hook while the new
+   frame is half-initialized.  */
+Lisp_Object inhibit_lisp_code;
+
 static Lisp_Object funcall_lambda (Lisp_Object, ptrdiff_t, Lisp_Object *);
 static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
 static int interactive_p (int);
@@ -3766,6 +3772,8 @@ alist of active lexical bindings.  */);
   staticpro (&Vsignaling_function);
   Vsignaling_function = Qnil;
 
+  inhibit_lisp_code = Qnil;
+
   defsubr (&Sor);
   defsubr (&Sand);
   defsubr (&Sif);
diff --git a/src/frame.c b/src/frame.c
index 8505398a260..1db24cc80e7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1118,41 +1118,32 @@ Otherwise, include all frames.  */)
 static int
 other_visible_frames (FRAME_PTR f)
 {
-  /* We know the selected frame is visible,
-     so if F is some other frame, it can't be the sole visible one.  */
-  if (f == SELECTED_FRAME ())
-    {
-      Lisp_Object frames;
-      int count = 0;
+  Lisp_Object frames;
 
-      for (frames = Vframe_list;
-           CONSP (frames);
-           frames = XCDR (frames))
-        {
-          Lisp_Object this;
+  for (frames = Vframe_list; CONSP (frames); frames = XCDR (frames))
+    {
+      Lisp_Object this = XCAR (frames);
+      if (f == XFRAME (this))
+        continue;
 
-          this = XCAR (frames);
-          /* Verify that the frame's window still exists
-             and we can still talk to it.  And note any recent change
-             in visibility.  */
+      /* Verify that we can still talk to the frame's X window,
+         and note any recent change in visibility.  */
 #ifdef HAVE_WINDOW_SYSTEM
-          if (FRAME_WINDOW_P (XFRAME (this)))
-            {
-              x_sync (XFRAME (this));
-              FRAME_SAMPLE_VISIBILITY (XFRAME (this));
-            }
+      if (FRAME_WINDOW_P (XFRAME (this)))
+        {
+          x_sync (XFRAME (this));
+          FRAME_SAMPLE_VISIBILITY (XFRAME (this));
+        }
 #endif
 
-          if (FRAME_VISIBLE_P (XFRAME (this))
-              || FRAME_ICONIFIED_P (XFRAME (this))
-              /* Allow deleting the terminal frame when at least
-                 one X frame exists!  */
-              || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f)))
-            count++;
-        }
-      return count > 1;
+      if (FRAME_VISIBLE_P (XFRAME (this))
+          || FRAME_ICONIFIED_P (XFRAME (this))
+          /* Allow deleting the terminal frame when at least one X
+             frame exists.  */
+          || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f)))
+        return 1;
     }
-  return 1;
+  return 0;
 }
 
 /* Delete FRAME.  When FORCE equals Qnoelisp, delete FRAME
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 1ed5833bd5c..4dbef65dedf 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1304,10 +1304,13 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position)
 
   hint_flags |= GDK_HINT_BASE_SIZE;
   base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f);
-  base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0)
+  /* Use one row here so base_height does not become zero.
+     Gtk+ and/or Unity on Ubuntu 12.04 can't handle it.  */
+  base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
     + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
 
   check_frame_size (f, &min_rows, &min_cols);
+  if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */
 
   size_hints.base_width = base_width;
   size_hints.base_height = base_height;
diff --git a/src/keymap.c b/src/keymap.c
index 0ae055213c3..ecaeb32896e 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2043,8 +2043,9 @@ static Lisp_Object Qsingle_key_description, Qkey_description;
 DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0,
        doc: /* Return a pretty description of key-sequence KEYS.
 Optional arg PREFIX is the sequence of keys leading up to KEYS.
-Control characters turn into "C-foo" sequences, meta into "M-foo",
-spaces are put between sequence elements, etc.  */)
+For example, [?\C-x ?l] is converted into the string \"C-x l\".
+
+The `kbd' macro is an approximate inverse of this.  */)
   (Lisp_Object keys, Lisp_Object prefix)
 {
   int len = 0;
diff --git a/src/lisp.h b/src/lisp.h
index f2177ad789d..678c48e8ff3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2941,6 +2941,7 @@ extern Lisp_Object Qinhibit_quit, Qclosure;
 extern Lisp_Object Qand_rest;
 extern Lisp_Object Vautoload_queue;
 extern Lisp_Object Vsignaling_function;
+extern Lisp_Object inhibit_lisp_code;
 extern int handling_signal;
 #if BYTE_MARK_STACK
 extern struct catchtag *catchlist;
diff --git a/src/window.c b/src/window.c
index df315a2366c..2a9d308b836 100644
--- a/src/window.c
+++ b/src/window.c
@@ -124,9 +124,6 @@ static int window_initialized;
 /* Hook to run when window config changes.  */
 static Lisp_Object Qwindow_configuration_change_hook;
 
-/* If non-nil, run_window_configuration_change_hook does nothing.  */
-Lisp_Object inhibit_window_configuration_change_hook;
-
 /* Used by the function window_scroll_pixel_based */
 static int window_scroll_pixel_based_preserve_x;
 static int window_scroll_pixel_based_preserve_y;
@@ -2899,7 +2896,7 @@ run_window_configuration_change_hook (struct frame *f)
     = Fdefault_value (Qwindow_configuration_change_hook);
   XSETFRAME (frame, f);
 
-  if (NILP (Vrun_hooks) || !NILP (inhibit_window_configuration_change_hook))
+  if (NILP (Vrun_hooks) || !NILP (inhibit_lisp_code))
     return;
 
   /* Use the right buffer.  Matters when running the local hooks.  */
@@ -6532,8 +6529,6 @@ syms_of_window (void)
   window_scroll_preserve_hpos = -1;
   window_scroll_preserve_vpos = -1;
 
-  inhibit_window_configuration_change_hook = Qnil;
-
   DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function,
                doc: /* Non-nil means call as function to display a help buffer.
 The function is called with one argument, the buffer to be displayed.
diff --git a/src/window.h b/src/window.h
index f4a5f52b9a5..ea127ca95a8 100644
--- a/src/window.h
+++ b/src/window.h
@@ -810,10 +810,6 @@ extern Lisp_Object Vmouse_window;
 
 extern Lisp_Object Vmouse_event;
 
-/* If non-nil, run_window_configuration_change_hook does nothing.  */
-
-extern Lisp_Object inhibit_window_configuration_change_hook;
-
 EXFUN (Fnext_window, 3);
 EXFUN (Fselect_window, 2);
 EXFUN (Fset_window_buffer, 3);
diff --git a/src/xfns.c b/src/xfns.c
index 6fcd129e4a4..6f08ada1bb9 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2952,7 +2952,7 @@ unwind_create_frame (Lisp_Object frame)
 static Lisp_Object
 unwind_create_frame_1 (Lisp_Object val)
 {
-  inhibit_window_configuration_change_hook = val;
+  inhibit_lisp_code = val;
   return Qnil;
 }
 
@@ -3337,9 +3337,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
      Vframe_list.  */
   {
     int count2 = SPECPDL_INDEX ();
-    record_unwind_protect (unwind_create_frame_1,
-                           inhibit_window_configuration_change_hook);
-    inhibit_window_configuration_change_hook = Qt;
+    record_unwind_protect (unwind_create_frame_1, inhibit_lisp_code);
+    inhibit_lisp_code = Qt;
 
     x_default_parameter (f, parms, Qmenu_bar_lines,
                          NILP (Vmenu_bar_mode)