Merge from trunk.

7 files changed, 53 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9513dfd8e64..fd1644c9b98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,8 +2,6 @@
 
         * image.c (png_load): Don't assume height * row_bytes fits in 'int'.
 
-2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
-
         * bidi.c (bidi_dump_cached_states): Use pD to print ptrdiff_t.
 
         * xfaces.c (Fbitmap_spec_p): Fix integer overflow bug.
@@ -92,8 +90,8 @@
         * bidi.c: Integer signedness and overflow fixes.
         (bidi_cache_idx, bidi_cache_last_idx, bidi_cache_fetch_state)
         (bidi_cache_search, bidi_cache_find_level_change)
-        (bidi_cache_iterator_state, bidi_cache_find, bidi_find_other_level_edge)
-        (bidi_dump_cached_states):
+        (bidi_cache_iterator_state, bidi_cache_find)
+        (bidi_find_other_level_edge, bidi_dump_cached_states):
         Don't arbitrarily limit cache indexes to int; use ptrdiff_t instead.
         (bidi_cache_size): Use ptrdiff_t rather than size_t, as we prefer
         signed integers.
@@ -166,6 +164,40 @@
         Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
         well either way, and we prefer signed to unsigned.
 
+2011-07-13  Johan Bockgård  <bojohan@gnu.org>
+
+        Fix execution of x selection hooks.
+        * xselect.c (Qx_lost_selection_functions)
+        (Qx_sent_selection_functions): New vars.
+        (syms_of_xselect): DEFSYM them.
+        (x_handle_selection_request): Pass Qx_sent_selection_functions
+        rather than Vx_sent_selection_functions to Frun_hook_with_args.
+        (x_handle_selection_clear,x_clear_frame_selections):
+        Pass Qx_lost_selection_functions rather than
+        Vx_lost_selection_functions to Frun_hook_with_args.
+
+2011-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking.
+        The old code sometimes used this field without initializing it.
+
+        * alloc.c (gc_sweep): Don't read past end of array.
+        In theory, the old code could also have corrupted Emacs internals,
+        though it'd be very unlikely.
+
+2011-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * character.c (Fcharacterp): Don't advertise optional ignored
+        argument. (Bug#4026)
+
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier
+        key" (bug#4257).
+
+        * window.c (Fset_window_start): Doc fix (bug#4199).
+        (Fset_window_hscroll): Ditto.
+
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix minor new problems caught by GCC 4.6.1.
diff --git a/src/alloc.c b/src/alloc.c
index f325b6ed449..eb356fd0e83 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5753,7 +5753,7 @@ gc_sweep (void)
         int ilim = (lim + BITS_PER_INT - 1) / BITS_PER_INT;
 
         /* Scan the mark bits an int at a time.  */
-        for (i = 0; i <= ilim; i++)
+        for (i = 0; i < ilim; i++)
           {
             if (cblk->gcmarkbits[i] == -1)
               {
diff --git a/src/buffer.c b/src/buffer.c
index 05e96e85112..7a94bc79be0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -361,6 +361,7 @@ even if it is dead.  The return value is never nil.  */)
   BUF_END_UNCHANGED (b) = 0;
   BUF_BEG_UNCHANGED (b) = 0;
   *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'.  */
+  b->text->inhibit_shrinking = 0;
 
   b->newline_cache = 0;
   b->width_run_cache = 0;
diff --git a/src/character.c b/src/character.c
index 7fc5d647ff5..8e9b3e3775e 100644
--- a/src/character.c
+++ b/src/character.c
@@ -258,7 +258,8 @@ multibyte_char_to_unibyte_safe (int c)
 }
 
 DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
-       doc: /* Return non-nil if OBJECT is a character.  */)
+       doc: /* Return non-nil if OBJECT is a character.
+usage: (characterp OBJECT)  */)
   (Lisp_Object object, Lisp_Object ignore)
 {
   return (CHARACTERP (object) ? Qt : Qnil);
diff --git a/src/keymap.c b/src/keymap.c
index d33af68be48..0169276bef9 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3712,11 +3712,11 @@ the same way.  The "active" keymaps in each alist are used before
   Vemulation_mode_map_alists = Qnil;
 
   DEFVAR_LISP ("where-is-preferred-modifier", Vwhere_is_preferred_modifier,
-               doc: /* Preferred modifier to use for `where-is'.
+               doc: /* Preferred modifier key to use for `where-is'.
 When a single binding is requested, `where-is' will return one that
-uses this modifier if possible.  If nil, or if no such binding exists,
-bindings using keys without modifiers (or only with meta) will be
-preferred.  */);
+uses this modifier key if possible.  If nil, or if no such binding
+exists, bindings using keys without modifiers (or only with meta) will
+be preferred.  */);
   Vwhere_is_preferred_modifier = Qnil;
   where_is_preferred_modifier = 0;
 
diff --git a/src/window.c b/src/window.c
index 154efe4a222..e390c13dce0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -683,6 +683,7 @@ WINDOW must be a live window and defaults to the selected one.  */)
 
 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
        doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL.
+If WINDOW is nil, the selected window is used.
 Return NCOL.  NCOL should be zero or positive.
 
 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the
@@ -1410,7 +1411,7 @@ Return POS.  */)
 
 DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0,
        doc: /* Make display in WINDOW start at position POS in WINDOW's buffer.
-WINDOW defaults to the selected window.  Return POS.
+If WINDOW is nil, the selected window is used.  Return POS.
 Optional third arg NOFORCE non-nil inhibits next redisplay from
 overriding motion of point in order to display at this exact start.  */)
   (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce)
diff --git a/src/xselect.c b/src/xselect.c
index 93a5c8bfa02..f63977a73de 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -112,6 +112,7 @@ static Lisp_Object QUTF8_STRING;	/* This is a type of selection.  */
 static Lisp_Object Qcompound_text_with_extensions;
 
 static Lisp_Object Qforeign_selection;
+static Lisp_Object Qx_lost_selection_functions, Qx_sent_selection_functions;
 
 /* If this is a smaller number than the max-request-size of the display,
    emacs will use INCR selection transfer when the selection is larger
@@ -855,7 +856,7 @@ x_handle_selection_request (struct input_event *event)
       && !EQ (Vx_sent_selection_functions, Qunbound))
     {
       Lisp_Object args[4];
-      args[0] = Vx_sent_selection_functions;
+      args[0] = Qx_sent_selection_functions;
       args[1] = selection_symbol;
       args[2] = target_symbol;
       args[3] = success ? Qt : Qnil;
@@ -979,7 +980,7 @@ x_handle_selection_clear (struct input_event *event)
   /* Run the `x-lost-selection-functions' abnormal hook.  */
   {
     Lisp_Object args[2];
-    args[0] = Vx_lost_selection_functions;
+    args[0] = Qx_lost_selection_functions;
     args[1] = selection_symbol;
     Frun_hook_with_args (2, args);
   }
@@ -1020,7 +1021,7 @@ x_clear_frame_selections (FRAME_PTR f)
     {
       /* Run the `x-lost-selection-functions' abnormal hook.  */
       Lisp_Object args[2];
-      args[0] = Vx_lost_selection_functions;
+      args[0] = Qx_lost_selection_functions;
       args[1] = Fcar (Fcar (t->Vselection_alist));
       Frun_hook_with_args (2, args);
 
@@ -1033,7 +1034,7 @@ x_clear_frame_selections (FRAME_PTR f)
         && EQ (frame, XCAR (XCDR (XCDR (XCDR (XCAR (XCDR (rest))))))))
       {
         Lisp_Object args[2];
-        args[0] = Vx_lost_selection_functions;
+        args[0] = Qx_lost_selection_functions;
         args[1] = XCAR (XCAR (XCDR (rest)));
         Frun_hook_with_args (2, args);
         XSETCDR (rest, XCDR (XCDR (rest)));
@@ -2682,4 +2683,6 @@ A value of 0 means wait as long as necessary.  This is initialized from the
   DEFSYM (QNULL, "NULL");
   DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions");
   DEFSYM (Qforeign_selection, "foreign-selection");
+  DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions");
+  DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions");
 }