[Emacs-diffs] Changes to emacs/lisp/emulation/cua-rect.el

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-rect.el
diff -c emacs/lisp/emulation/cua-rect.el:1.24 
emacs/lisp/emulation/cua-rect.el:1.25
*** emacs/lisp/emulation/cua-rect.el:1.24       Sat Nov 26 23:30:43 2005
--- emacs/lisp/emulation/cua-rect.el    Tue Nov 29 23:58:20 2005
***************
*** 65,70 ****
--- 65,71 ----
  ;; List of overlays used to display current rectangle.
  (defvar cua--rectangle-overlays nil)
  (make-variable-buffer-local 'cua--rectangle-overlays)
+ (put 'cua--rectangle-overlays 'permanent-local t)
  
  (defvar cua--overlay-keymap
    (let ((map (make-sparse-keymap)))
***************
*** 1393,1399 ****
        (if (and mark-active
                 (not deactivate-mark))
            (cua--highlight-rectangle)
!         (cua--deactivate-rectangle)))
    (when cua--rect-undo-set-point
      (goto-char cua--rect-undo-set-point)
      (setq cua--rect-undo-set-point nil)))
--- 1394,1405 ----
        (if (and mark-active
                 (not deactivate-mark))
            (cua--highlight-rectangle)
!         (cua--deactivate-rectangle))
!     (when cua--rectangle-overlays
!       ;; clean-up after revert-buffer
!       (mapcar (function delete-overlay) cua--rectangle-overlays)
!       (setq cua--rectangle-overlays nil)
!       (setq deactivate-mark t)))
    (when cua--rect-undo-set-point
      (goto-char cua--rect-undo-set-point)
      (setq cua--rect-undo-set-point nil)))