comparison lisp/emulation/cua-rect.el @ 84905:47928cf63c6c

(cua--deactivate-rectangle, cua--highlight-rectangle, cua--rectangle-post-command): Use `mapc' rather than `mapcar'.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 26 Sep 2007 00:16:39 +0000
parents ac0efac52065
children 52abd10af81e bdb3fe0ba9fa
comparison
equal deleted inserted replaced
84904:e2e245301b8c 84905:47928cf63c6c
729 729
730 ;; (defvar cua-save-point nil) 730 ;; (defvar cua-save-point nil)
731 731
732 (defun cua--deactivate-rectangle () 732 (defun cua--deactivate-rectangle ()
733 ;; This is used to clean up after `cua--activate-rectangle'. 733 ;; This is used to clean up after `cua--activate-rectangle'.
734 (mapcar (function delete-overlay) cua--rectangle-overlays) 734 (mapc (function delete-overlay) cua--rectangle-overlays)
735 (setq cua--last-rectangle (cons (current-buffer) 735 (setq cua--last-rectangle (cons (current-buffer)
736 (cons (point) ;; cua-save-point 736 (cons (point) ;; cua-save-point
737 cua--rectangle)) 737 cua--rectangle))
738 cua--rectangle nil 738 cua--rectangle nil
739 cua--rectangle-overlays nil 739 cua--rectangle-overlays nil
835 (overlay-put overlay 'face rface) 835 (overlay-put overlay 'face rface)
836 (overlay-put overlay 'keymap cua--overlay-keymap) 836 (overlay-put overlay 'keymap cua--overlay-keymap)
837 (overlay-put overlay 'window (selected-window)) 837 (overlay-put overlay 'window (selected-window))
838 (setq new (cons overlay new)))))) 838 (setq new (cons overlay new))))))
839 ;; Trim old trailing overlays. 839 ;; Trim old trailing overlays.
840 (mapcar (function delete-overlay) old) 840 (mapc (function delete-overlay) old)
841 (setq cua--rectangle-overlays (nreverse new)))) 841 (setq cua--rectangle-overlays (nreverse new))))
842 842
843 (defun cua--indent-rectangle (&optional ch to-col clear) 843 (defun cua--indent-rectangle (&optional ch to-col clear)
844 ;; Indent current rectangle. 844 ;; Indent current rectangle.
845 (let ((col (cua--rectangle-insert-col)) 845 (let ((col (cua--rectangle-insert-col))
1399 (not deactivate-mark)) 1399 (not deactivate-mark))
1400 (cua--highlight-rectangle) 1400 (cua--highlight-rectangle)
1401 (cua--deactivate-rectangle)) 1401 (cua--deactivate-rectangle))
1402 (when cua--rectangle-overlays 1402 (when cua--rectangle-overlays
1403 ;; clean-up after revert-buffer 1403 ;; clean-up after revert-buffer
1404 (mapcar (function delete-overlay) cua--rectangle-overlays) 1404 (mapc (function delete-overlay) cua--rectangle-overlays)
1405 (setq cua--rectangle-overlays nil) 1405 (setq cua--rectangle-overlays nil)
1406 (setq deactivate-mark t))) 1406 (setq deactivate-mark t)))
1407 (when cua--rect-undo-set-point 1407 (when cua--rect-undo-set-point
1408 (goto-char cua--rect-undo-set-point) 1408 (goto-char cua--rect-undo-set-point)
1409 (setq cua--rect-undo-set-point nil))) 1409 (setq cua--rect-undo-set-point nil)))