Merge from emacs-24; up to 2014-06-06T02:22:[email protected]

5 files changed, 26 insertions, 5 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4089068c90..3b7ca9c728 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21  Eli Zaretskii  <[email protected]>
+
+	* positions.texi (Screen Lines): Clarify how columns are counted
+	by vertical-motion.
+
 2014-06-15  Glenn Morris  <[email protected]>
 
 	* Makefile.in (bootstrap-clean): New.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 5a77b37e7e..e32f0ef0b3 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -500,7 +500,11 @@ is negative, it moves up instead.
 The @var{count} argument can be a cons cell, @code{(@var{cols}
 . @var{lines})}, instead of an integer.  Then the function moves by
 @var{lines} screen lines, and puts point @var{cols} columns from the
-start of that screen line.
+visual start of that screen line.  Note that @var{cols} are counted
+from the @emph{visual} start of the line; if the window is scrolled
+horizontally (@pxref{Horizontal Scrolling}), the column on which point
+will end is in addition to the number of columns by which the text is
+scrolled.
 
 The return value is the number of screen lines over which point was
 moved.  The value may be less in absolute value than @var{count} if
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a6ddb15496..a1a99e5fd0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-21  Eli Zaretskii  <[email protected]>
+
+	* autotype.texi (Skeleton Language): Document the feature of \n
+	when at eol.
+
+2014-06-21  Michael Albinus  <[email protected]>
+
+	* dbus.texi (Type Conversion): Formatting edits in example.
+
 2014-06-15  Michael Albinus  <[email protected]>
 
 	Sync with Tramp 2.2.10.
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 04f74cc44c..e0fce74bd3 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 e7f822498b..0c19cb963e 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