procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rectangle--pos-cols shouldn't move point

Browse source 
* lisp/rect.el (rectangle--pos-cols): Don't move point while
calculating the values (bug#25777).
This commit is contained in:
Lars Ingebrigtsen 2019-06-24 19:10:32 +02:00
parent 9f5f5ae638
commit 35c72aea44
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
lisp/rect.el
View file

@ -77,34 +77,35 @@ Point is at the end of the segment of this line within the rectangle."
;; At this stage, we don't know which of start/end is point/mark :-(
;; And in case start=end, it might still be that point and mark have
;; different crutches!
(let ((cw (window-parameter window 'rectangle--point-crutches)))
(cond
((eq start (car cw))
(let ((sc (cdr cw))
(ec (if (eq end (car rectangle--mark-crutches))
(cdr rectangle--mark-crutches)
(if rectangle--mark-crutches
(setq rectangle--mark-crutches nil))
(goto-char end) (current-column))))
(if (eq start end) (cons (min sc ec) (max sc ec)) (cons sc ec))))
((eq end (car cw))
(if (eq start (car rectangle--mark-crutches))
(cons (cdr rectangle--mark-crutches) (cdr cw))
(save-excursion
(let ((cw (window-parameter window 'rectangle--point-crutches)))
(cond
((eq start (car cw))
(let ((sc (cdr cw))
(ec (if (eq end (car rectangle--mark-crutches))
(cdr rectangle--mark-crutches)
(if rectangle--mark-crutches
(setq rectangle--mark-crutches nil))
(goto-char end) (current-column))))
(if (eq start end) (cons (min sc ec) (max sc ec)) (cons sc ec))))
((eq end (car cw))
(if (eq start (car rectangle--mark-crutches))
(cons (cdr rectangle--mark-crutches) (cdr cw))
(if rectangle--mark-crutches (setq rectangle--mark-crutches nil))
(cons (progn (goto-char start) (current-column)) (cdr cw))))
((progn
(if cw (setf (window-parameter nil 'rectangle--point-crutches) nil))
(eq start (car rectangle--mark-crutches)))
(let ((sc (cdr rectangle--mark-crutches))
(ec (progn (goto-char end) (current-column))))
(if (eq start end) (cons (min sc ec) (max sc ec)) (cons sc ec))))
((eq end (car rectangle--mark-crutches))
(cons (progn (goto-char start) (current-column))
(cdr rectangle--mark-crutches)))
(t
(if rectangle--mark-crutches (setq rectangle--mark-crutches nil))
(cons (progn (goto-char start) (current-column)) (cdr cw))))
((progn
(if cw (setf (window-parameter nil 'rectangle--point-crutches) nil))
(eq start (car rectangle--mark-crutches)))
(let ((sc (cdr rectangle--mark-crutches))
(ec (progn (goto-char end) (current-column))))
(if (eq start end) (cons (min sc ec) (max sc ec)) (cons sc ec))))
((eq end (car rectangle--mark-crutches))
(cons (progn (goto-char start) (current-column))
(cdr rectangle--mark-crutches)))
(t
(if rectangle--mark-crutches (setq rectangle--mark-crutches nil))
(cons (progn (goto-char start) (current-column))
(progn (goto-char end) (current-column)))))))
(cons (progn (goto-char start) (current-column))
(progn (goto-char end) (current-column))))))))
(defun rectangle--col-pos (col kind)
(let ((c (move-to-column col)))