[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.11 
emacs/lisp/emulation/cua-rect.el:1.12
*** emacs/lisp/emulation/cua-rect.el:1.11       Thu Sep  2 22:56:22 2004
--- emacs/lisp/emulation/cua-rect.el    Fri Sep  3 12:33:54 2004
***************
*** 65,70 ****
--- 65,74 ----
  (defvar cua--rectangle-overlays nil)
  (make-variable-buffer-local 'cua--rectangle-overlays)
  
+ (defvar cua--overlay-keymap
+   (let ((map (make-sparse-keymap)))
+     (define-key map "\r" 'cua-rotate-rectangle)))
+ 
  (defvar cua--virtual-edges-debug nil)
  
  ;; Per-buffer CUA mode undo list.
***************
*** 274,281 ****
      (move-to-column mc)
      (set-mark (point))
      (goto-char pp)
      (if (and (if (cua--rectangle-right-side)
!                (= (move-to-column pc) (- pc tab-width))
               (> (move-to-column pc) pc))
             (not (bolp)))
        (backward-char 1))
--- 278,287 ----
      (move-to-column mc)
      (set-mark (point))
      (goto-char pp)
+     ;; Move cursor inside rectangle, except if char at rigth edge is a tab.
      (if (and (if (cua--rectangle-right-side)
!                (and (= (move-to-column pc) (- pc tab-width))
!                     (not (eolp)))
               (> (move-to-column pc) pc))
             (not (bolp)))
        (backward-char 1))
***************
*** 285,291 ****
  
  (defun cua--forward-line (n)
    ;; Move forward/backward one line.  Returns t if movement.
!   (= (forward-line n) 0))
  
  (defun cua--rectangle-resized ()
    ;; Refresh state after resizing rectangle
--- 291,301 ----
  
  (defun cua--forward-line (n)
    ;; Move forward/backward one line.  Returns t if movement.
!   (let ((pt (point)))
!     (and (= (forward-line n) 0)
!        ;; Deal with end of buffer
!        (or (not (eobp))
!            (goto-char pt)))))
  
  (defun cua--rectangle-resized ()
    ;; Refresh state after resizing rectangle
***************
*** 843,848 ****
--- 853,859 ----
             (overlay-put overlay 'before-string bs)
             (overlay-put overlay 'after-string as)
             (overlay-put overlay 'face rface)
+            (overlay-put overlay 'keymap cua--overlay-keymap)
             (setq new (cons overlay new))))))
      ;; Trim old trailing overlays.
      (mapcar (function delete-overlay) old)