merge from trunk

6 files changed, 17 insertions, 7 deletions

diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 0d5ce6820c7..34783796899 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1140,6 +1140,7 @@ Please help us keep up with the workload by designing the patch in a
 form that is clearly safe to install.
 @end itemize
 
+@c FIXME: Include the node above?
 @node Contributing
 @section Contributing to Emacs Development
 @cindex contributing to Emacs
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index f351829e4cf..ec949b37684 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -549,6 +549,8 @@ is @code{nil}, which means the character itself.
 @defun get-char-code-property char propname
 This function returns the value of @var{char}'s @var{propname} property.
 
+@c FIXME: Use ‘?\s’ instead of ‘? ’ for the space character in the
+@c first example?  --xfq
 @example
 @group
 (get-char-code-property ?  'general-category)
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e3ad5688f22..aa1e69891a2 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * ido.texi (Interactive Substring Matching): Use @key{RET} instead
+        of @kbd{RET}.
+        (Prefix Matching): Add an index.
+
 2013-09-08  Glenn Morris  <rgm@gnu.org>
 
         * emacs-gnutls.texi: Tweak direntry.
diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index 623fb4bfa79..64885179259 100644
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -258,7 +258,7 @@ Buffer: 23@{123456 | 123@}
 At this point, you still have two matching buffers.  If you want the
 first buffer in the list, you can simply press @key{RET}.  If you want
 the second in the list, you can press @kbd{C-s} to move it to the top
-of the list and then press @kbd{RET} to select it.
+of the list and then press @key{RET} to select it.
 
 However, if you type @kbd{4}, you'll only have one match left:
 
@@ -366,6 +366,7 @@ users Ido offers in addition to the default substring matching method
 the only difference to the description of the substring matching
 above.
 
+@cindex toggle prefix matching
 You can toggle prefix matching with @kbd{C-p}
 (@code{ido-toggle-prefix}).
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 41e20465d57..dda202af89f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2013-09-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * termhooks.h (fullscreen_hook): Remove the leftover.
+        (struct terminal): Fix typo in comment.
+
+2013-09-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Cleaning up a few X scroll bar bits.
         * termhooks.h (enum scroll_bar_part): Add scroll_bar_nowhere member.
         * xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS && USE_LUCID]:
diff --git a/src/termhooks.h b/src/termhooks.h
index 3f9ccdcb1d6..1efdc7222cb 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -43,11 +43,6 @@ enum scroll_bar_part {
   scroll_bar_move_ratio
 };
 
-/* If the value of the frame parameter changed, whis hook is called.
-   For example, if going from fullscreen to not fullscreen this hook
-   may do something OS dependent, like extended window manager hints on X11.  */
-extern void (*fullscreen_hook) (struct frame *f);
-
 /* Output method of a terminal (and frames on this terminal, respectively).  */
 
 enum output_method
@@ -502,7 +497,7 @@ struct terminal
      windows.  */
   void (*frame_raise_lower_hook) (struct frame *f, int raise_flag);
 
-  /* If the value of the frame parameter changed, whis hook is called.
+  /* If the value of the frame parameter changed, this hook is called.
      For example, if going from fullscreen to not fullscreen this hook
      may do something OS dependent, like extended window manager hints on X11.  */
   void (*fullscreen_hook) (struct frame *f);