Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

10 files changed, 131 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f5da7ce4ee3..2881574684c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,65 @@
+2014-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * frame.c (x_set_frame_parameters): Don't read uninitialized storage.
+
+2014-06-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (xg_scroll_callback): Remove position, for jump set portion
+        to min(value, whole).
+
+2014-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Bring back the changes to GDB-visible symbols, but only on AIX.
+        And only if it's not pre-4.2 GCC.
+        * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
+        (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
+        (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
+        New macros.
+
+2014-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer
+        with PT, not GPT.  (Bug#16433)
+
+        Revert last changes to GDB-visible symbols.
+        * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros.
+        (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them.
+        (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
+        Delete macros.
+
+2014-06-02  Glenn Morris  <rgm@gnu.org>
+
+        * cmds.c (Fself_insert_command): Allow zero repeat count.  (Bug#17649)
+
+2014-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix port to 32-bit AIX with xlc (Bug#17598).
+        * alloc.c (gdb_make_enums_visible): Remove FLOAT_TO_STRING_BUFSIZE.
+        * conf_post.h (FLEXIBLE_ARRAY_MEMBER) [__IBMC__]: Don't define to empty.
+        * lisp.h (FLOAT_TO_STRING_BUFSIZE): Make it a macro, instead of an enum,
+        to work around a compiler bug in IBM xlc 12.1.
+
+2014-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * xterm.c (x_update_window_end): Don't invalidate the entire
+        mouse-highlight info, just signal frame_up_to_date_hook that mouse
+        highlight needs to be redisplayed.  (Bug#17588)
+
+2014-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port the GDB-visible symbols to AIX.
+        Without them, GDB doesn't work to debug Emacs, since the AIX linker
+        optimizes away the relevant external symbols.  Use enums instead;
+        this suffices for the AIX port, which is 32-bit-only anyway.
+        * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
+        (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
+        (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
+        New macros.
+
+        Include sources used to create macuvs.h.
+        * Makefile.in ($(srcdir)/macuvs.h): New rule.
+        * macuvs.h: Use automatically-generated header.
+
 2014-06-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port signal-handling to DragonFly BSD (Bug#17646).
diff --git a/src/Makefile.in b/src/Makefile.in
index 020ecd62a5e..697ff3a29f0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -419,7 +419,8 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
         cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
 
-$(lispsource)/international/charprop.el: bootstrap-emacs$(EXEEXT)
+$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
+  bootstrap-emacs$(EXEEXT)
         cd ../admin/unidata && $(MAKE) $(MFLAGS) all EMACS="../$(bootstrap_exe)"
 
 ## The dumped Emacs is as functional and more efficient than
diff --git a/src/alloc.c b/src/alloc.c
index d728c356109..60b035e6028 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7200,7 +7200,6 @@ union
   enum char_bits char_bits;
   enum CHECK_LISP_OBJECT_TYPE CHECK_LISP_OBJECT_TYPE;
   enum DEFAULT_HASH_SIZE DEFAULT_HASH_SIZE;
-  enum FLOAT_TO_STRING_BUFSIZE FLOAT_TO_STRING_BUFSIZE;
   enum Lisp_Bits Lisp_Bits;
   enum Lisp_Compiled Lisp_Compiled;
   enum maxargs maxargs;
diff --git a/src/cmds.c b/src/cmds.c
index b5aa69d6391..828fea3d753 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -280,8 +280,8 @@ At the end, it runs `post-self-insert-hook'.  */)
   bool remove_boundary = 1;
   CHECK_NUMBER (n);
 
-  if (XFASTINT (n) < 1)
-    error ("Nonpositive repetition argument %"pI"d", XFASTINT (n));
+  if (XFASTINT (n) < 0)
+    error ("Negative repetition argument %"pI"d", XFASTINT (n));
 
   if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command)))
     nonundocount = 0;
diff --git a/src/conf_post.h b/src/conf_post.h
index 6f6af3d3e02..9c82d7d2a71 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -311,8 +311,13 @@ extern void _DebPrint (const char *fmt, ...);
    and allocate (offsetof (struct s, name) + N * sizeof (t)) bytes.
 
    This macro used to expand to something different on pre-C99 compilers.
+   IBM xlc 12.1 claims to do C99 but mishandles flexible array members.
    FIXME: Remove it, and remove all uses.  */
-#define FLEXIBLE_ARRAY_MEMBER
+#ifdef __IBMC__
+# define FLEXIBLE_ARRAY_MEMBER 1
+#else
+# define FLEXIBLE_ARRAY_MEMBER
+#endif
 
 /* Use this to suppress gcc's `...may be used before initialized' warnings. */
 #ifdef lint
diff --git a/src/fileio.c b/src/fileio.c
index dcee70aa8b4..8b20c65802d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4085,7 +4085,7 @@ by calling `format-decode', which see.  */)
           && !NILP (BVAR (current_buffer, filename))
           && SAVE_MODIFF >= MODIFF)
         we_locked_file = 1;
-      prepare_to_modify_buffer (GPT, GPT, NULL);
+      prepare_to_modify_buffer (PT, PT, NULL);
     }
 
   move_gap_both (PT, PT_BYTE);
diff --git a/src/frame.c b/src/frame.c
index 1d5312b4758..4575ac0553e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2830,7 +2830,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
   /* If both of these parameters are present, it's more efficient to
      set them both at once.  So we wait until we've looked at the
      entire list before we set them.  */
-  int width, height;
+  int width = 0, height = 0;
   bool width_change = 0, height_change = 0;
 
   /* Same here.  */
diff --git a/src/lisp.h b/src/lisp.h
index 5002fa2a282..028abe350c3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -36,14 +36,40 @@ INLINE_HEADER_BEGIN
 
 /* Define a TYPE constant ID as an externally visible name.  Use like this:
 
+      #define ID_val (some integer preprocessor expression)
+      #if ENUMABLE (ID_val)
+      DEFINE_GDB_SYMBOL_ENUM (ID)
+      #else
       DEFINE_GDB_SYMBOL_BEGIN (TYPE, ID)
-      #define ID something
+      # define ID ID_val
       DEFINE_GDB_SYMBOL_END (ID)
+      #endif
 
    This hack is for the benefit of compilers that do not make macro
    definitions visible to the debugger.  It's used for symbols that
    .gdbinit needs, symbols whose values may not fit in 'int' (where an
-   enum would suffice).  */
+   enum would suffice).
+
+   Some GCC versions before GCC 4.2 omit enums in debugging output;
+   see GCC bug 23336.  So don't use enums with older GCC.  */
+
+#if !defined __GNUC__ || 4 < __GNUC__ + (2 <= __GNUC_MINOR__)
+# define ENUMABLE(val) (INT_MIN <= (val) && (val) <= INT_MAX)
+#else
+# define ENUMABLE(val) 0
+#endif
+
+/* On AIX 7.1 ENUMABLE should return true when possible, otherwise the
+   linker can optimize the symbols away, making it harder to debug.
+   This was discovered only late in the release process, so to play it
+   safe for now, non-AIX platforms do not use enums for debugging symbols.
+   FIXME: remove this comment and the following four lines of code.  */
+#ifndef _AIX
+# undef ENUMABLE
+# define ENUMABLE(val) 0
+#endif
+
+#define DEFINE_GDB_SYMBOL_ENUM(id) enum { id = id##_val };
 #if defined MAIN_PROGRAM
 # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE
 # define DEFINE_GDB_SYMBOL_END(id) = id;
@@ -574,15 +600,25 @@ LISP_MACRO_DEFUN (XIL, Lisp_Object, (EMACS_INT i), (i))
 
 /* In the size word of a vector, this bit means the vector has been marked.  */
 
+#define ARRAY_MARK_FLAG_val PTRDIFF_MIN
+#if ENUMABLE (ARRAY_MARK_FLAG_val)
+DEFINE_GDB_SYMBOL_ENUM (ARRAY_MARK_FLAG)
+#else
 DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, ARRAY_MARK_FLAG)
-#define ARRAY_MARK_FLAG PTRDIFF_MIN
+# define ARRAY_MARK_FLAG ARRAY_MARK_FLAG_val
 DEFINE_GDB_SYMBOL_END (ARRAY_MARK_FLAG)
+#endif
 
 /* In the size word of a struct Lisp_Vector, this bit means it's really
    some other vector-like object.  */
+#define PSEUDOVECTOR_FLAG_val (PTRDIFF_MAX - PTRDIFF_MAX / 2)
+#if ENUMABLE (PSEUDOVECTOR_FLAG_val)
+DEFINE_GDB_SYMBOL_ENUM (PSEUDOVECTOR_FLAG)
+#else
 DEFINE_GDB_SYMBOL_BEGIN (ptrdiff_t, PSEUDOVECTOR_FLAG)
-#define PSEUDOVECTOR_FLAG (PTRDIFF_MAX - PTRDIFF_MAX / 2)
+# define PSEUDOVECTOR_FLAG PSEUDOVECTOR_FLAG_val
 DEFINE_GDB_SYMBOL_END (PSEUDOVECTOR_FLAG)
+#endif
 
 /* In a pseudovector, the size field actually contains a word with one
    PSEUDOVECTOR_FLAG bit set, and one of the following values extracted
@@ -634,9 +670,15 @@ enum More_Lisp_Bits
    XCONS (tem) is the struct Lisp_Cons * pointing to the memory for
    that cons.  */
 
+/* Mask for the value (as opposed to the type bits) of a Lisp object.  */
+#define VALMASK_val (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX)
+#if ENUMABLE (VALMASK_val)
+DEFINE_GDB_SYMBOL_ENUM (VALMASK)
+#else
 DEFINE_GDB_SYMBOL_BEGIN (EMACS_INT, VALMASK)
-#define VALMASK (USE_LSB_TAG ? - (1 << GCTYPEBITS) : VAL_MAX)
+# define VALMASK VALMASK_val
 DEFINE_GDB_SYMBOL_END (VALMASK)
+#endif
 
 /* Largest and smallest representable fixnum values.  These are the C
    values.  They are macros for use in static initializers.  */
@@ -3794,7 +3836,7 @@ extern void print_error_message (Lisp_Object, Lisp_Object, const char *,
                                  Lisp_Object);
 extern Lisp_Object internal_with_output_to_temp_buffer
         (const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
-enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
+#define FLOAT_TO_STRING_BUFSIZE 350
 extern int float_to_string (char *, double);
 extern void init_print_once (void);
 extern void syms_of_print (void);
diff --git a/src/macuvs.h b/src/macuvs.h
index 20879888f9a..2f52ce3da8e 100644
--- a/src/macuvs.h
+++ b/src/macuvs.h
@@ -1,11 +1,4 @@
-/* UVS (Unicode Variation Sequence) table definitions.
-
-This file is part of GNU Emacs.  */
-
-/* This was generated from the Ideographic Variation Database file at
-   http://www.unicode.org/ivd/data/2012-03-02/IVD_Sequences.txt
-   using admin/mac/uvs.el in GNU Emacs, and distributed under
-   the Terms of Use in http://www.unicode.org/terms_of_use.html.  */
+/* Automatically generated by uvs.el.  */
 static const unsigned char mac_uvs_table_adobe_japan1_bytes[] =
   {
     0x00, 0x0e, 0x00, 0x01, 0x1f, 0x9e, 0x00, 0x00,
diff --git a/src/xterm.c b/src/xterm.c
index 83d3cb1ab73..c4b8db35f31 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -602,7 +602,13 @@ x_update_window_end (struct window *w, bool cursor_on_p,
   /* If a row with mouse-face was overwritten, arrange for
      XTframe_up_to_date to redisplay the mouse highlight.  */
   if (mouse_face_overwritten_p)
-    reset_mouse_highlight (MOUSE_HL_INFO (XFRAME (w->frame)));
+    {
+      Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (XFRAME (w->frame));
+
+      hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+      hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+      hlinfo->mouse_face_window = Qnil;
+    }
 }
 
 
@@ -4428,14 +4434,11 @@ xg_scroll_callback (GtkRange     *range,
                     gpointer      user_data)
 {
   struct scroll_bar *bar = user_data;
-  gdouble position;
   int part = -1, whole = 0, portion = 0;
   GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range));
   struct frame *f = g_object_get_data (G_OBJECT (range), XG_FRAME_DATA);
 
   if (xg_ignore_gtk_scrollbar) return FALSE;
-  position = gtk_adjustment_get_value (adj);
-
 
   switch (scroll)
     {
@@ -4447,7 +4450,7 @@ xg_scroll_callback (GtkRange     *range,
           part = scroll_bar_handle;
           whole = gtk_adjustment_get_upper (adj) -
             gtk_adjustment_get_page_size (adj);
-          portion = min ((int)position, whole);
+          portion = min ((int)value, whole);
           bar->dragging = portion;
         }
       break;