Merge from origin/emacs-25

[gnu-emacs] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 1247cb25da2c8ad7dcb3a7af0a063b5e366a1658..e2570625f3207d8604e297ca5a62039fa6404421 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6421,7 +6421,8 @@ Those commands will move to this position in the line moved to
 rather than trying to keep the same horizontal position.
 With a non-nil argument ARG, clears out the goal column
 so that \\[next-line] and \\[previous-line] resume vertical motion.
-The goal column is stored in the variable `goal-column'."
+The goal column is stored in the variable `goal-column'.
+This is a buffer-local setting."
   (interactive "P")
   (if arg
       (progn