/[emacs]/emacs/lisp/emulation/cua-rect.el
ViewVC logotype

Diff of /emacs/lisp/emulation/cua-rect.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11 by kfstorm, Thu Sep 2 22:56:22 2004 UTC revision 1.12 by kfstorm, Fri Sep 3 12:33:54 2004 UTC
# Line 65  Line 65 
65  (defvar cua--rectangle-overlays nil)  (defvar cua--rectangle-overlays nil)
66  (make-variable-buffer-local 'cua--rectangle-overlays)  (make-variable-buffer-local 'cua--rectangle-overlays)
67    
68    (defvar cua--overlay-keymap
69      (let ((map (make-sparse-keymap)))
70        (define-key map "\r" 'cua-rotate-rectangle)))
71    
72  (defvar cua--virtual-edges-debug nil)  (defvar cua--virtual-edges-debug nil)
73    
74  ;; Per-buffer CUA mode undo list.  ;; Per-buffer CUA mode undo list.
# Line 274  Knows about CUA rectangle highlighting i Line 278  Knows about CUA rectangle highlighting i
278      (move-to-column mc)      (move-to-column mc)
279      (set-mark (point))      (set-mark (point))
280      (goto-char pp)      (goto-char pp)
281        ;; Move cursor inside rectangle, except if char at rigth edge is a tab.
282      (if (and (if (cua--rectangle-right-side)      (if (and (if (cua--rectangle-right-side)
283                   (= (move-to-column pc) (- pc tab-width))                   (and (= (move-to-column pc) (- pc tab-width))
284                          (not (eolp)))
285                 (> (move-to-column pc) pc))                 (> (move-to-column pc) pc))
286               (not (bolp)))               (not (bolp)))
287          (backward-char 1))          (backward-char 1))
# Line 285  Knows about CUA rectangle highlighting i Line 291  Knows about CUA rectangle highlighting i
291    
292  (defun cua--forward-line (n)  (defun cua--forward-line (n)
293    ;; Move forward/backward one line.  Returns t if movement.    ;; Move forward/backward one line.  Returns t if movement.
294    (= (forward-line n) 0))    (let ((pt (point)))
295        (and (= (forward-line n) 0)
296             ;; Deal with end of buffer
297             (or (not (eobp))
298                 (goto-char pt)))))
299    
300  (defun cua--rectangle-resized ()  (defun cua--rectangle-resized ()
301    ;; Refresh state after resizing rectangle    ;; Refresh state after resizing rectangle
# Line 843  If command is repeated at same position, Line 853  If command is repeated at same position,
853               (overlay-put overlay 'before-string bs)               (overlay-put overlay 'before-string bs)
854               (overlay-put overlay 'after-string as)               (overlay-put overlay 'after-string as)
855               (overlay-put overlay 'face rface)               (overlay-put overlay 'face rface)
856                 (overlay-put overlay 'keymap cua--overlay-keymap)
857               (setq new (cons overlay new))))))               (setq new (cons overlay new))))))
858      ;; Trim old trailing overlays.      ;; Trim old trailing overlays.
859      (mapcar (function delete-overlay) old)      (mapcar (function delete-overlay) old)

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26