aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-08-26 12:52:07 +0300
committerEli Zaretskii2017-08-26 12:52:07 +0300
commitdcc3ef3ee7b7cf2730378fca4c959f1fc799fbe2 (patch)
tree395a99b970758206c2125e3d0546b93f46baa8aa
parent5bb61463a281961198b6fbafa99023e7807584b6 (diff)
downloademacs-dcc3ef3ee7b7cf2730378fca4c959f1fc799fbe2.tar.gz
emacs-dcc3ef3ee7b7cf2730378fca4c959f1fc799fbe2.zip
Fix bugs merged with bug#25428
* lisp/simple.el (auto-fill-mode, visual-line-mode): Doc fix. (Bug#13926) (Bug#25434) (Bug#25435)
-rw-r--r--lisp/simple.el18
1 files changed, 12 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 072723cd644..13cfa3487da 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6828,9 +6828,12 @@ other purposes."
6828 6828
6829(define-minor-mode visual-line-mode 6829(define-minor-mode visual-line-mode
6830 "Toggle visual line based editing (Visual Line mode). 6830 "Toggle visual line based editing (Visual Line mode).
6831With a prefix argument ARG, enable Visual Line mode if ARG is 6831Interactively, with a prefix argument, enable
6832positive, and disable it otherwise. If called from Lisp, enable 6832Visual Line mode if the prefix argument is positive,
6833the mode if ARG is omitted or nil. 6833and disable it otherwise. If called from Lisp, toggle
6834the mode if ARG is `toggle', disable the mode if ARG is
6835a non-positive integer, and enable the mode otherwise
6836\(including if ARG is omitted or nil or a positive integer).
6834 6837
6835When Visual Line mode is enabled, `word-wrap' is turned on in 6838When Visual Line mode is enabled, `word-wrap' is turned on in
6836this buffer, and simple editing commands are redefined to act on 6839this buffer, and simple editing commands are redefined to act on
@@ -7262,9 +7265,12 @@ Some major modes set this.")
7262 7265
7263(define-minor-mode auto-fill-mode 7266(define-minor-mode auto-fill-mode
7264 "Toggle automatic line breaking (Auto Fill mode). 7267 "Toggle automatic line breaking (Auto Fill mode).
7265With a prefix argument ARG, enable Auto Fill mode if ARG is 7268Interactively, with a prefix argument, enable
7266positive, and disable it otherwise. If called from Lisp, enable 7269Auto Fill mode if the prefix argument is positive,
7267the mode if ARG is omitted or nil. 7270and disable it otherwise. If called from Lisp, toggle
7271the mode if ARG is `toggle', disable the mode if ARG is
7272a non-positive integer, and enable the mode otherwise
7273\(including if ARG is omitted or nil or a positive integer).
7268 7274
7269When Auto Fill mode is enabled, inserting a space at a column 7275When Auto Fill mode is enabled, inserting a space at a column
7270beyond `current-fill-column' automatically breaks the line at a 7276beyond `current-fill-column' automatically breaks the line at a