[Emacs-diffs] /srv/bzr/emacs/trunk r105885: * simple.el (kill-line): Note effect of `show-trailing-whitespace'.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105885
fixes bug(s): http://debbugs.gnu.org/4538
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-23 12:52:23 +0200
message:
  * simple.el (kill-line): Note effect of `show-trailing-whitespace'.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-23 09:38:41 +0000
+++ b/lisp/ChangeLog    2011-09-23 10:52:23 +0000
@@ -1,3 +1,8 @@
+2011-09-23  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * simple.el (kill-line): Note effect of `show-trailing-whitespace'
+       (bug#4538).
+
 2011-09-23  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions): Fix

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-09-22 16:49:57 +0000
+++ b/lisp/simple.el    2011-09-23 10:52:23 +0000
@@ -3430,6 +3430,10 @@
 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