diff options
| author | Vibhav Pant | 2017-02-13 17:07:36 +0530 |
|---|---|---|
| committer | Vibhav Pant | 2017-02-13 17:07:36 +0530 |
| commit | cb410433e069b5bb450193353c3fea8593a643a9 (patch) | |
| tree | d2f4269781b4841e5a0c27ec57a5a4fbcec386c0 /lisp/simple.el | |
| parent | e742450427007cdde242c11380dfe32a950fab61 (diff) | |
| parent | 4b18ef7ba3dd8aae4f3c3bf931365ef7da883baf (diff) | |
| download | emacs-feature/byte-switch.tar.gz emacs-feature/byte-switch.zip | |
Merge branch 'master' into feature/byte-switchfeature/byte-switch
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index c0dad2d36e7..f110c6f3267 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -6665,7 +6665,7 @@ even beep.)" | |||
| 6665 | ;; whether the trailing whitespace is highlighted. But, it's | 6665 | ;; whether the trailing whitespace is highlighted. But, it's |
| 6666 | ;; OK to just do this unconditionally. | 6666 | ;; OK to just do this unconditionally. |
| 6667 | (skip-chars-forward " \t"))) | 6667 | (skip-chars-forward " \t"))) |
| 6668 | (kill-region opoint (if (and kill-whole-line (looking-at "\n")) | 6668 | (kill-region opoint (if (and kill-whole-line (= (following-char) ?\n)) |
| 6669 | (1+ (point)) | 6669 | (1+ (point)) |
| 6670 | (point))))) | 6670 | (point))))) |
| 6671 | 6671 | ||