diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-02-18 11:32:45 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-02-18 11:32:45 +0200 |
| commit | 3ce07b18f9a65f961ce959b5af32d05714f5a802 (patch) | |
| tree | 230cd9e3f5cfb730c4744c0b7d71b578ea4914ca /lisp/rect.el | |
| parent | 73ea77c856ded90cfb1a03a9d87827b5ecb93a7c (diff) | |
| download | emacs-3ce07b18f9a65f961ce959b5af32d05714f5a802.tar.gz | |
Avoid infloop in rect.el
* lisp/rect.el (rectangle--*-char): Avoid inflooping when called
with argument N whose absolute value is greater than 1. (Bug#25773)
Diffstat (limited to 'lisp/rect.el')
| -rw-r--r-- | lisp/rect.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/rect.el b/lisp/rect.el index a4fa282791f..a85101fddfa 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -639,7 +639,8 @@ Activates the region if needed. Only lasts until the region is deactivated." ;; rectangles" and not "visual rectangles", so in the presence of ;; bidirectional text things won't work well anyway. (if (< n 0) (rectangle--*-char other-cmd (- n)) - (let ((col (rectangle--point-col (point)))) + (let ((col (rectangle--point-col (point))) + (step 1)) (while (> n 0) (let* ((bol (line-beginning-position)) (eol (line-end-position)) @@ -647,7 +648,7 @@ Activates the region if needed. Only lasts until the region is deactivated." (nextcol (condition-case nil (save-excursion - (funcall cmd 1) + (funcall cmd step) (cond ((> bol (point)) (- curcol 1)) ((< eol (point)) (+ col (1+ n))) @@ -666,7 +667,8 @@ Activates the region if needed. Only lasts until the region is deactivated." (t ;; (> nextcol curcol) (if (<= diff n) (progn (cl-decf n diff) (setq col nextcol)) - (setq col (if (< col nextcol) (+ col n) (- col n)) n 0)))))) + (setq col (if (< col nextcol) (+ col n) (- col n)) n 0)))) + (setq step (1+ step)))) ;; FIXME: This rectangle--col-pos's move-to-column is wasted! (rectangle--col-pos col 'point)))) |