Merge from emacs-24; up to 2014-06-08T18:27:[email protected]

3 files changed, 18 insertions, 8 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a6b8702073..d7b030fb1a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-24  Leo Liu  <[email protected]>
+
+	* dired-x.texi (Omitting Files in Dired, Omitting Variables):
+	Fix key binding to dired-omit-mode.  (Bug#16354)
+
+2014-06-24  Eli Zaretskii  <[email protected]>
+
+	* autotype.texi (Skeleton Language): Document the \n feature better.
+
 2014-06-23  Glenn Morris  <[email protected]>
 
 	* Makefile.in (%.texi): Disable implicit rules.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index e0fce74bd3..a2988795fc 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -234,9 +234,10 @@ Insert string or character.  Literal strings and characters are passed through
 @c ??? something seems very wrong here.
 Insert a newline and align under current line, but not if this is the
 last element of a skeleton and the newline would be inserted at end of
-line.  Use newline character @code{?\n} to prevent alignment.  Use
-@code{"\n"} as the last string element of a skeleton to insert a
-newline after the skeleton unconditionally.
+line, or this is the first element and the newline would be inserted
+at beginning of line.  Use newline character @code{?\n} to prevent
+alignment.  Use @code{"\n"} as the first or last string element of a
+skeleton to insert a newline unconditionally.
 @item @code{_}
 Interesting point.  When wrapping skeletons around successive regions, they are
 put at these places.  Point is left at first @code{_} where nothing is wrapped.
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index a69d72c7d4..1eb512b737 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -283,8 +283,8 @@ Marked files are never omitted.
 @end itemize
 
 @table @kbd
-@item M-o
-@kindex M-o
+@item C-x M-o
+@kindex C-x M-o
 @findex dired-omit-mode
 (@code{dired-omit-mode}) Toggle between displaying and omitting
 ``uninteresting'' files.
@@ -324,7 +324,7 @@ Default: @code{nil}
 If non-@code{nil}, ``uninteresting'' files are not listed.
 Uninteresting files are those whose files whose names match regexp
 @code{dired-omit-files}, plus those ending with extensions in
-@code{dired-omit-extensions}.  @kbd{M-o} (@code{dired-omit-mode})
+@code{dired-omit-extensions}.  @kbd{C-x M-o} (@code{dired-omit-mode})
 toggles its value, which is buffer-local.  Put
 
 @example
@@ -333,8 +333,8 @@ toggles its value, which is buffer-local.  Put
 
 @noindent
 inside your @code{dired-mode-hook} to have omitting initially turned on in
-@emph{every} Dired buffer (@pxref{Installation}).  You can then use @kbd{M-o} to
-unomit in that buffer.
+@emph{every} Dired buffer (@pxref{Installation}).  You can then use
+@kbd{C-x M-o} to unomit in that buffer.
 
 To enable omitting automatically only in certain directories you can add
 a directory local setting