From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 23 Sep 2011 10:52:23 +0000 (+0200)
Subject: * simple.el (kill-line): Note effect of `show-trailing-whitespace'.
X-Git-Tag: emacs-pretest-24.0.90~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=022de23e6c93c5c4528f10a7d7feb6402d2a05c6;p=emacs.git

* simple.el (kill-line): Note effect of `show-trailing-whitespace'.

Fixes: debbugs:4538
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff0e18403a6..1fdad104fea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* simple.el (kill-line): Note effect of `show-trailing-whitespace'
+	(bug#4538).
+
 2011-09-23  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): Fix
diff --git a/lisp/simple.el b/lisp/simple.el
index 3cd46bf284c..35193135396 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3430,6 +3430,10 @@ a number counts as a prefix arg.
 To kill a whole line, when point is not at the beginning, type \
 \\[move-beginning-of-line] \\[kill-line] \\[kill-line].
 
+If `show-trailing-whitespace' is non-nil, this command will just
+kill the rest of the current line, even if there are only
+nonblanks there.
+
 If `kill-whole-line' is non-nil, then this command kills the whole line
 including its terminating newline, when used at the beginning of a line
 with no argument.  As a consequence, you can always kill a whole line