Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

3 files changed, 16 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a6ddb15496d..a1a99e5fd06 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * autotype.texi (Skeleton Language): Document the feature of \n
+        when at eol.
+
+2014-06-21  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbus.texi (Type Conversion): Formatting edits in example.
+
 2014-06-15  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.10.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 04f74cc44cb..e0fce74bd3f 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -232,8 +232,11 @@ Insert string or character.  Literal strings and characters are passed through
 @code{skeleton-transformation} when that is non-@code{nil}.
 @item @code{?\n}
 @c ??? something seems very wrong here.
-Insert a newline and align under current line.  Use newline character
-@code{?\n} to prevent alignment.
+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.
 @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/dbus.texi b/doc/misc/dbus.texi
index e7f822498b6..0c19cb963e7 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1060,11 +1060,11 @@ elements of this array.  Example:
   ""                          ;; No icon.
   "Notification summary"      ;; Summary.
   (format                     ;; Body.
-    "This is a test notification, raised from %s" (emacs-version))
+    "This is a test notification, raised from\n%S" (emacs-version))
   '(:array)                   ;; No actions (empty array of strings).
   '(:array :signature "@{sv@}") ;; No hints
                               ;; (empty array of dictionary entries).
-  :int32 -1)                 ;; Default timeout.
+  :int32 -1)                  ;; Default timeout.
 
 @result{} 3
 @end lisp