diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:41:47 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:41:47 -0400 |
| commit | 23e9beff8cb950112fb9f750d4b3040d3fe36e05 (patch) | |
| tree | 8b63a8f04ad3a0acee281c92b7b147cdfd70a303 /lisp/simple.el | |
| parent | f4e9ceacdae2de88a165e94b5c2f34eeb4115139 (diff) | |
| parent | f21fa142aca53e3de5783e1ce6fe1bf116174aeb (diff) | |
| download | emacs-23e9beff8cb950112fb9f750d4b3040d3fe36e05.tar.gz emacs-23e9beff8cb950112fb9f750d4b3040d3fe36e05.tar.bz2 emacs-23e9beff8cb950112fb9f750d4b3040d3fe36e05.zip | |
Merge from emacs-26
55c9bb9f3c Fix comint-get-old-input-default for output field case (Bu...
26819cd1c0 ; ChangeLog.3: Fix typo.
e35a08ea4b Prevent infloop in 'delete-trailing-whitespace'
* lisp/progmodes/cperl-mode.el:
* lisp/progmodes/cc-engine.el:
* lisp/progmodes/cc-mode.el: Fix tabs mixed with space preventing
commit hook from succeeding.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 57e70a8d153..3d625bd2886 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -697,8 +697,9 @@ buffer if the variable `delete-trailing-lines' is non-nil." (while (re-search-forward "\\s-$" end-marker t) (skip-syntax-backward "-" (line-beginning-position)) (let ((b (point)) (e (match-end 0))) - (when (region-modifiable-p b e) - (delete-region b e))))) + (if (region-modifiable-p b e) + (delete-region b e) + (goto-char e))))) (if end (set-marker end-marker nil) ;; Delete trailing empty lines. |