summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el9
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dccc44375a..c5eb9f94e53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * simple.el (toggle-truncate-lines): Clarify what is toggled
+ (bug#5580). Text by Drew Adams.
+
2011-07-13 Chong Yidong <cyd@stupidchicken.com>
* simple.el (blink-matching-open): Make the error message from the
diff --git a/lisp/simple.el b/lisp/simple.el
index 0f301dae505..895496a34f8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5303,11 +5303,12 @@ The variable `selective-display' has a separate value for each buffer."
(defvaralias 'indicate-unused-lines 'indicate-empty-lines)
(defun toggle-truncate-lines (&optional arg)
- "Toggle whether to fold or truncate long lines for the current buffer.
+ "Toggle truncating of long lines for the current buffer.
+When truncating is off, long lines are folded.
With prefix argument ARG, truncate long lines if ARG is positive,
-otherwise don't truncate them. Note that in side-by-side windows,
-this command has no effect if `truncate-partial-width-windows'
-is non-nil."
+otherwise fold them. Note that in side-by-side windows, this
+command has no effect if `truncate-partial-width-windows' is
+non-nil."
(interactive "P")
(setq truncate-lines
(if (null arg)