diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-09-23 12:52:23 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-09-23 12:52:23 +0200 |
| commit | 022de23e6c93c5c4528f10a7d7feb6402d2a05c6 (patch) | |
| tree | e6ac1918c0148e8ba47fe1ad2cdc8b04fe68105a | |
| parent | 8eca8a7c4885c27af36f52320185dbcae5f693e0 (diff) | |
| download | emacs-022de23e6c93c5c4528f10a7d7feb6402d2a05c6.tar.gz | |
* simple.el (kill-line): Note effect of `show-trailing-whitespace'.
Fixes: debbugs:4538
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 4 |
2 files changed, 9 insertions, 0 deletions
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 |