aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-13 18:39:49 +0200
committerLars Magne Ingebrigtsen2011-07-13 18:39:49 +0200
commit1d8c2ccc666d9427741f301334fd03bf73e4d40a (patch)
treedc660401ff73aa71dab567827c86ba448c7872c6
parent5fc4038e207dc31e10a6d58d9294617fcda054bf (diff)
downloademacs-1d8c2ccc666d9427741f301334fd03bf73e4d40a.tar.gz
emacs-1d8c2ccc666d9427741f301334fd03bf73e4d40a.zip
Clarify doc string
* simple.el (toggle-truncate-lines): Clarify what is toggled (bug#5580). Text by Drew Adams.
-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 @@
12011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * simple.el (toggle-truncate-lines): Clarify what is toggled
4 (bug#5580). Text by Drew Adams.
5
12011-07-13 Chong Yidong <cyd@stupidchicken.com> 62011-07-13 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * simple.el (blink-matching-open): Make the error message from the 8 * 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."
5303(defvaralias 'indicate-unused-lines 'indicate-empty-lines) 5303(defvaralias 'indicate-unused-lines 'indicate-empty-lines)
5304 5304
5305(defun toggle-truncate-lines (&optional arg) 5305(defun toggle-truncate-lines (&optional arg)
5306 "Toggle whether to fold or truncate long lines for the current buffer. 5306 "Toggle truncating of long lines for the current buffer.
5307When truncating is off, long lines are folded.
5307With prefix argument ARG, truncate long lines if ARG is positive, 5308With prefix argument ARG, truncate long lines if ARG is positive,
5308otherwise don't truncate them. Note that in side-by-side windows, 5309otherwise fold them. Note that in side-by-side windows, this
5309this command has no effect if `truncate-partial-width-windows' 5310command has no effect if `truncate-partial-width-windows' is
5310is non-nil." 5311non-nil."
5311 (interactive "P") 5312 (interactive "P")
5312 (setq truncate-lines 5313 (setq truncate-lines
5313 (if (null arg) 5314 (if (null arg)