mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

Avoid infloop in rect.el

Browse Source 
* lisp/rect.el (rectangle--*-char): Avoid inflooping when called
with argument N whose absolute value is greater than 1.  (Bug#25773)
This commit is contained in:
Eli Zaretskii 2017-02-18 11:32:45 +02:00
parent 73ea77c856
commit 3ce07b18f9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/rect.el
View File

@ -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))))