Merge from trunk.

21 files changed, 179 insertions, 119 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d762ea11654..bd5cfdce66b 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * text.texi (Table Recognition): Use "at point" instead of "under
+        point" (bug#4345).
+
+        * display.texi (Cursor Display): Mention `cursor-type'.
+
+        * screen.texi (Point): Clarify that it's only if you use a block
+        cursor that it appears to be on a character (bug#4345).
+
 2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * misc.texi (Amusements): Move dissociated press here, from its
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 210b1b636a1..bfbfb355c9c 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1211,6 +1211,10 @@ terminal itself blinks the cursor, and Emacs has no control over it.)
 You can control how the cursor appears when it blinks off by setting
 the variable @code{blink-cursor-alist}.
 
+@vindex cursor-type
+  You can change the shape of the cursor from the default ``box'' look
+to a bar by altering the @code{cursor-type} variable.
+
 @vindex visible-cursor
   Some text terminals offer two different cursors: the normal cursor
 and the very visible cursor, where the latter may be e.g. bigger or
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index 145687270ca..59f65fac8af 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -73,14 +73,14 @@ different places in the buffer; for example, you can place point by
 clicking mouse button 1 (normally the left button) at the desired
 location.
 
-  While the cursor appears to be @emph{on} a character, you should
-think of point as @emph{between} two characters; it points @emph{before}
-the character that appears under the cursor.  For example, if your text
-looks like @samp{frob} with the cursor over the @samp{b}, then point is
-between the @samp{o} and the @samp{b}.  If you insert the character
-@samp{!} at that position, the result is @samp{fro!b}, with point
-between the @samp{!} and the @samp{b}.  Thus, the cursor remains over
-the @samp{b}, as before.
+  If you use a block cursor, the cursor appears to be @emph{on} a
+character, but you should think of point as @emph{between} two
+characters; it points @emph{before} the character that appears under
+the cursor.  For example, if your text looks like @samp{frob} with the
+cursor over the @samp{b}, then point is between the @samp{o} and the
+@samp{b}.  If you insert the character @samp{!} at that position, the
+result is @samp{fro!b}, with point between the @samp{!} and the
+@samp{b}.  Thus, the cursor remains over the @samp{b}, as before.
 
   Sometimes people speak of ``the cursor'' when they mean ``point,'' or
 speak of commands that move point as ``cursor motion'' commands.
@@ -92,12 +92,14 @@ it again later.  When Emacs displays multiple windows, each window has
 its own point location.  If the same buffer appears in more than one
 window, each window has its own point position in that buffer.
 
-  On a graphical display, Emacs shows a cursor in each window; the
-selected window's cursor is solid and blinking, and the other cursors
-are hollow.  On a text-only terminal, there is just one cursor, in the
-selected window; even though the unselected windows have their own
-point positions, they do not display a cursor.  @xref{Cursor Display},
-for customizable variables that control cursor display.
+  On a graphical display, Emacs shows a cursor in each window.  The
+selected window's cursor will be blinking.  If you use the default,
+@code{box} cursor type, the selected window's cursor will be solid,
+and the other cursors are hollow.  On a text-only terminal, there is
+just one cursor, in the selected window; even though the unselected
+windows have their own point positions, they do not display a cursor.
+@xref{Cursor Display}, for customizable variables that control cursor
+display.
 
 @node Echo Area
 @section The Echo Area
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index dbda771e6a3..e3f5c05d8da 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2506,16 +2506,16 @@ Recognize tables within the current region and activate them.
 Deactivate tables within the current region.
 @findex table-recognize-table
 @item M-x table-recognize-table
-Recognize the table under point and activate it.
+Recognize the table at point and activate it.
 @findex table-unrecognize-table
 @item M-x table-unrecognize-table
-Deactivate the table under point.
+Deactivate the table at point.
 @findex table-recognize-cell
 @item M-x table-recognize-cell
-Recognize the cell under point and activate it.
+Recognize the cell at point and activate it.
 @findex table-unrecognize-cell
 @item M-x table-unrecognize-cell
-Deactivate the cell under point.
+Deactivate the cell at point.
 @end table
 
   For another way of converting text into tables, see @ref{Table
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4517faac80e..1d1730e078d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,22 @@
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * display.texi (Face Attributes, Font Selection): Add references
+        to the Fonts node in the Emacs manual (Bug#4178).
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * display.texi (Window Systems): `window-system' is
+        terminal-local.
+
+        * frames.texi (Frame Parameters, Parameter Access): Don't mention
+        frame-local variables.
+
+        * variables.texi (Buffer-Local Variables): Don't mention obsolete
+        frame-local variables.
+        (Frame-Local Variables): Node deleted.
+
+        * elisp.texi (Top): Update node listing.
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * elisp.texi: Change "inferiors" to "subnodes" in three places
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index bc81c59f05f..10119e54670 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1800,9 +1800,9 @@ height.
 @cindex faces
 
   A @dfn{face} is a collection of graphical attributes for displaying
-text: font family, foreground color, background color, optional
-underlining, and so on.  Faces control how buffer text is displayed,
-and how some parts of the frame, such as the mode-line, are displayed.
+text: font, foreground color, background color, optional underlining,
+and so on.  Faces control how buffer text is displayed, and how some
+parts of the frame, such as the mode-line, are displayed.
 @xref{Standard Faces,,, emacs, The GNU Emacs Manual}, for the list of
 faces Emacs normally comes with.
 
@@ -2001,16 +2001,17 @@ attribute is ignored.
 
 @table @code
 @item :family
-Font family name or fontset name (a string).  If you specify a font
-family name, the wild-card characters @samp{*} and @samp{?} are
-allowed.  The function @code{font-family-list}, described below,
-returns a list of available family names.  @xref{Fontsets}, for
-information about fontsets.
+Font family or fontset (a string).  @xref{Fonts,,, emacs, The GNU
+Emacs Manual}.  If you specify a font family name, the wild-card
+characters @samp{*} and @samp{?} are allowed.  The function
+@code{font-family-list}, described below, returns a list of available
+family names.  @xref{Fontsets}, for information about fontsets.
 
 @item :foundry
-The name of the @dfn{font foundry} in which the font family specified
-by the @code{:family} attribute is located (a string).  The wild-card
-characters @samp{*} and @samp{?} are allowed.
+The name of the @dfn{font foundry} for the font family specified by
+the @code{:family} attribute (a string).  The wild-card characters
+@samp{*} and @samp{?} are allowed.  @xref{Fonts,,, emacs, The GNU
+Emacs Manual}.
 
 @item :width
 Relative proportionate character width, also known as the character
@@ -2684,14 +2685,15 @@ usually assign faces to around 400 to 600 characters at each call.
   Before Emacs can draw a character on a particular display, it must
 select a @dfn{font} for that character@footnote{In this context, the
 term @dfn{font} has nothing to do with Font Lock (@pxref{Font Lock
-Mode}).}.  Normally, Emacs automatically chooses a font based on the
-faces assigned to that character---specifically, the face attributes
-@code{:family}, @code{:weight}, @code{:slant}, and @code{:width}
-(@pxref{Face Attributes}).  The choice of font also depends on the
-character to be displayed; some fonts can only display a limited set
-of characters.  If no available font exactly fits the requirements,
-Emacs looks for the @dfn{closest matching font}.  The variables in
-this section control how Emacs makes this selection.
+Mode}).}.  @xref{Fonts,,, emacs, The GNU Emacs Manual}.  Normally,
+Emacs automatically chooses a font based on the faces assigned to that
+character---specifically, the face attributes @code{:family},
+@code{:weight}, @code{:slant}, and @code{:width} (@pxref{Face
+Attributes}).  The choice of font also depends on the character to be
+displayed; some fonts can only display a limited set of characters.
+If no available font exactly fits the requirements, Emacs looks for
+the @dfn{closest matching font}.  The variables in this section
+control how Emacs makes this selection.
 
 @defopt face-font-family-alternatives
 If a given family is specified but does not exist, this variable
@@ -5910,8 +5912,8 @@ differently.  An Emacs frame is a single window as far as X is
 concerned; the individual Emacs windows are not known to X at all.
 
 @defvar window-system
-This frame-local variable tells Lisp programs what window system Emacs is using
-for displaying the frame.  The possible values are
+This terminal-local variable tells Lisp programs what window system
+Emacs is using for displaying the frame.  The possible values are
 
 @table @code
 @item x
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 4f8dce561a5..bb05f1b4a0b 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -430,7 +430,6 @@ Variables
 * File Local Variables::    Handling local variable lists in files.
 * Directory Local Variables:: Local variables common to all files in a
                                 directory.
-* Frame-Local Variables::   Frame-local bindings for variables.
 * Variable Aliases::        Variables that are aliases for other variables.
 * Variables with Restricted Values::  Non-constant variables whose value can
                                         @emph{not} be an arbitrary Lisp object.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 9a30ba5fdb4..b6012a4dd53 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -337,9 +337,6 @@ parameters @code{foreground-color}, @code{background-color},
 If the terminal supports frame transparency, the parameter
 @code{alpha} is also meaningful.
 
-  You can use frame parameters to define frame-local bindings for
-variables.  @xref{Frame-Local Variables}.
-
 @menu
 * Parameter Access::       How to change a frame's parameters.
 * Initial Parameters::     Specifying frame parameters when you make a frame.
@@ -374,9 +371,6 @@ elements of @var{alist}.  Each element of @var{alist} has the form
 parameter.  If you don't mention a parameter in @var{alist}, its value
 doesn't change.  If @var{frame} is @code{nil}, it defaults to the selected
 frame.
-
-You can use this function to define frame-local bindings for
-variables, see @ref{Frame-Local Variables}.
 @end defun
 
 @defun set-frame-parameter frame parm value
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 4ec1779b732..3da09369882 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -39,7 +39,6 @@ representing the variable.
 * Buffer-Local Variables::      Variable values in effect only in one buffer.
 * File Local Variables::        Handling local variable lists in files.
 * Directory Local Variables::   Local variables common to all files in a directory.
-* Frame-Local Variables::       Frame-local bindings for variables.
 * Variable Aliases::            Variables that are aliases for other variables.
 * Variables with Restricted Values::  Non-constant variables whose value can
                                         @emph{not} be an arbitrary Lisp object.
@@ -1187,8 +1186,7 @@ additional, unusual kinds of variable binding, such as
 @dfn{buffer-local} bindings, which apply only in one buffer.  Having
 different values for a variable in different buffers is an important
 customization method.  (Variables can also have bindings that are
-local to each terminal, or to each frame.  @xref{Multiple Terminals},
-and @xref{Frame-Local Variables}.)
+local to each terminal.  @xref{Multiple Terminals}.)
 
 @menu
 * Intro to Buffer-Local::       Introduction and concepts.
@@ -1287,9 +1285,8 @@ buffer-local binding of buffer @samp{b}.
 values when you visit the file.  @xref{File Variables,,, emacs, The
 GNU Emacs Manual}.
 
-  A buffer-local variable cannot be made frame-local
-(@pxref{Frame-Local Variables}) or terminal-local (@pxref{Multiple
-Terminals}).
+  A buffer-local variable cannot be made terminal-local
+(@pxref{Multiple Terminals}).
 
 @node Creating Buffer-Local
 @subsection Creating and Deleting Buffer-Local Bindings
@@ -1340,9 +1337,9 @@ is not current either on entry to or exit from the @code{let}.  This is
 because @code{let} does not distinguish between different kinds of
 bindings; it knows only which variable the binding was made for.
 
-If the variable is terminal-local (@pxref{Multiple Terminals}), or
-frame-local (@pxref{Frame-Local Variables}), this function signals an
-error.  Such variables cannot have buffer-local bindings as well.
+If the variable is terminal-local (@pxref{Multiple Terminals}), this
+function signals an error.  Such variables cannot have buffer-local
+bindings as well.
 
 @strong{Warning:} do not use @code{make-local-variable} for a hook
 variable.  The hook variables are automatically made buffer-local as
@@ -1880,36 +1877,6 @@ modification times of the associated directory local variables file
 updates this list.
 @end defvar
 
-@node Frame-Local Variables
-@section Frame-Local Values for Variables
-@cindex frame-local variables
-
-  In addition to buffer-local variable bindings (@pxref{Buffer-Local
-Variables}), Emacs supports @dfn{frame-local} bindings.  A frame-local
-binding for a variable is in effect in a frame for which it was
-defined.
-
-  In practice, frame-local variables have not proven very useful.
-Ordinary frame parameters are generally used instead (@pxref{Frame
-Parameters}).  The function @code{make-variable-frame-local}, which
-was used to define frame-local variables, has been deprecated since
-Emacs 22.2.  However, you can still define a frame-specific binding
-for a variable @var{var} in frame @var{frame}, by setting the
-@var{var} frame parameter for that frame:
-
-@lisp
-  (modify-frame-parameters @var{frame} '((@var{var} . @var{value})))
-@end lisp
-
-@noindent
-This causes the variable @var{var} to be bound to the specified
-@var{value} in the named @var{frame}.  To check the frame-specific
-values of such variables, use @code{frame-parameter}.  @xref{Parameter
-Access}.
-
-  Note that you cannot have a frame-local binding for a variable that
-has a buffer-local binding.
-
 @node Variable Aliases
 @section Variable Aliases
 @cindex variable aliases
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 0eb3fe1bda2..888c1f94c33 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -254,6 +254,7 @@ foo.c:8.23-45: Informational: message
 foo.c:8-23: message
 foo.c:8-45.3: message
 foo.c:8.23-9.1: message
+foo.el:3:1:Error: End of file during parsing
 jade:dbcommon.dsl:133:17:E: missing argument for function call
 G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
 file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a9e0267c3e..19c80a65888 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * files.el (after-find-file): Give a better error message when
+        trying to find a symlink that points to a file that doesn't exist
+        (bug#4398).
+
+        * progmodes/cc-vars.el: Remove (probably) misleading comment
+        (bug#4396).
+
+2011-07-12  Johan Bockgård  <bojohan@gnu.org>
+
+        * mouse-sel.el (mouse-sel-primary-overlay): Use the `region' face.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mouse-sel.el: Hack restoring functionality, while keeping
+        compatibility with 2010-07-03 changes to mouse selection.
+        (mouse-sel-primary-overlay): New var.
+        (mouse-sel-selection-alist): Use it.
+        (mouse-sel-mode): Doc fix; remove points that are default features
+        of mouse.el.
+
 2011-07-12  Johan Bockgård  <bojohan@gnu.org>
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
diff --git a/lisp/files.el b/lisp/files.el
index 1071adb6967..bf38ce39a07 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2060,7 +2060,11 @@ unless NOMODES is non-nil."
              ((not warn) nil)
              ((and error (file-attributes buffer-file-name))
               (setq buffer-read-only t)
-              "File exists, but cannot be read")
+              (if (and (file-symlink-p buffer-file-name)
+                       (not (file-exists-p
+                             (file-chase-links buffer-file-name))))
+                  "Symbolic link that points to nonexistent file"
+                "File exists, but cannot be read"))
              ((not buffer-read-only)
               (if (and warn
                        ;; No need to warn if buffer is auto-saved
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 1f601377ad4..50d221b6fa0 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -202,14 +202,10 @@ If nil, point will always be placed at the beginning of the region."
 With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive.
 Returns the new status of Mouse Sel mode (non-nil means on).
 
-When Mouse Sel mode is enabled, mouse selection is enhanced in various ways:
+When Mouse Sel mode is enabled, mouse selection is enhanced in
+various ways:
 
-- Clicking mouse-1 starts (cancels) selection, dragging extends it.
-
-- Clicking or dragging mouse-3 extends the selection as well.
-
-- Double-clicking on word constituents selects words.
-Double-clicking on symbol constituents selects symbols.
+- Double-clicking on symbol constituents selects symbols.
 Double-clicking on quotes or parentheses selects sexps.
 Double-clicking on whitespace selects whitespace.
 Triple-clicking selects lines.
@@ -224,14 +220,8 @@ mouse-sel sets the variables `interprogram-cut-function' and
 - Clicking mouse-2 inserts the contents of the primary selection at
 the mouse position (or point, if `mouse-yank-at-point' is non-nil).
 
-- Pressing mouse-2 while selecting or extending copies selection
-to the kill ring.  Pressing mouse-1 or mouse-3 kills it.
-
-- Double-clicking mouse-3 also kills selection.
-
-- M-mouse-1, M-mouse-2 & M-mouse-3 work similarly to mouse-1, mouse-2
-& mouse-3, but operate on the X secondary selection rather than the
-primary selection and region."
+- mouse-2 while selecting or extending copies selection to the
+kill ring; mouse-1 or mouse-3 kills it."
   :global t
   :group 'mouse-sel
   (if mouse-sel-mode
@@ -286,8 +276,17 @@ primary selection and region."
   (setq mouse-secondary-overlay (make-overlay 1 1))
   (overlay-put mouse-secondary-overlay 'face 'secondary-selection))
 
+(defconst mouse-sel-primary-overlay
+  (let ((ol (make-overlay (point-min) (point-min))))
+    (delete-overlay ol)
+    (overlay-put ol 'face 'region)
+    ol)
+  "An overlay which records the current primary selection.
+This is used by Mouse Sel mode only.")
+
 (defconst mouse-sel-selection-alist
-  '((SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing))
+  '((PRIMARY mouse-sel-primary-overlay mouse-sel-primary-thing)
+    (SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing))
   "Alist associating selections with variables.
 Each element is of the form:
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index d2a5d117635..58dc1737c5a 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1633,8 +1633,7 @@ as designated in the variable `c-file-style'.")
 ;; It isn't possible to specify a doc-string without specifying an
 ;; initial value with `defvar', so the following two variables have been
 ;; given doc-strings by setting the property `variable-documentation'
-;; directly.  C-h v will read this documentation only for versions of GNU
-;; Emacs from 22.1.  It's really good not to have an initial value for
+;; directly.  It's really good not to have an initial value for
 ;; variables like these that always should be dynamically bound, so it's
 ;; worth the inconvenience.
 
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");
 }