Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

3 files changed, 20 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7c368c126cd..e9ea1f7459e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * text.texi (Registers): Document register-read-with-preview.
+
+        * internals.texi (Building Emacs): Improve indexing.
+
 2014-04-17  Daniel Colascione  <dancol@dancol.org>
 
         * frames.texi (Terminal Parameters): Document new
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index d91b0349810..f85701f5396 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -111,6 +111,8 @@ drawback that the documentation strings take up space in Emacs all the
 time.)
 @end itemize
 
+@cindex change @code{load-path} at configure time
+@cindex @option{--enable-locallisppath} option to @command{configure}
   It is not advisable to put anything in @file{site-load.el} or
 @file{site-init.el} that would alter any of the features that users
 expect in an ordinary unmodified Emacs.  If you feel you must override
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 7c5603fd645..3c70f5f96b0 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4117,6 +4117,18 @@ a rectangle (a list), currently useless things happen.  This may be
 changed in the future.
 @end deffn
 
+@defun register-read-with-preview prompt
+@cindex register preview
+This function reads and returns a register name, prompting with
+@var{prompt} and possibly showing a preview of the existing registers
+and their contents.  The preview is shown in a temporary window, after
+the delay specified by the user option @code{register-preview-delay},
+if its value and @code{register-alist} are both non-@code{nil}.  The
+preview is also shown if the user requests help (e.g., by typing the
+help character).  We recommend that all interactive commands which
+read register names use this function.
+@end defun
+
 @node Transposition
 @section Transposition of Text