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

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-gmrk.el
diff -c emacs/lisp/emulation/cua-gmrk.el:1.5 
emacs/lisp/emulation/cua-gmrk.el:1.6
*** emacs/lisp/emulation/cua-gmrk.el:1.5        Mon Sep  1 15:45:22 2003
--- emacs/lisp/emulation/cua-gmrk.el    Mon Jun  6 13:19:15 2005
***************
*** 74,80 ****
        (move-overlay cua--global-mark-overlay (point) (1+ (point)))
      (setq cua--global-mark-overlay
          (make-overlay (point) (1+ (point))))
!     (overlay-put cua--global-mark-overlay 'face 'cua-global-mark-face))
    (if (and cua-global-mark-blink-cursor-interval
           (not cua--orig-blink-cursor-interval))
        (setq cua--orig-blink-cursor-interval blink-cursor-interval
--- 74,80 ----
        (move-overlay cua--global-mark-overlay (point) (1+ (point)))
      (setq cua--global-mark-overlay
          (make-overlay (point) (1+ (point))))
!     (overlay-put cua--global-mark-overlay 'face 'cua-global-mark))
    (if (and cua-global-mark-blink-cursor-interval
           (not cua--orig-blink-cursor-interval))
        (setq cua--orig-blink-cursor-interval blink-cursor-interval
***************
*** 218,224 ****
              (let ((olist (overlays-at (marker-position 
cua--global-mark-marker)))
                    in-rect)
                (while olist
!                 (if (eq (overlay-get (car olist) 'face) 'cua-rectangle-face)
                      (setq in-rect t olist nil)
                    (setq olist (cdr olist))))
                (if in-rect
--- 218,224 ----
              (let ((olist (overlays-at (marker-position 
cua--global-mark-marker)))
                    in-rect)
                (while olist
!                 (if (eq (overlay-get (car olist) 'face) 'cua-rectangle)
                      (setq in-rect t olist nil)
                    (setq olist (cdr olist))))
                (if in-rect
***************
*** 358,368 ****
  ;;; Initialization
  
  (defun cua--init-global-mark ()
-   (unless (face-background 'cua-global-mark-face)
-     (copy-face 'region 'cua-global-mark-face)
-     (set-face-foreground 'cua-global-mark-face "black")
-     (set-face-background 'cua-global-mark-face "cyan"))
- 
    (define-key cua--global-mark-keymap [remap copy-region-as-kill]     
'cua-copy-to-global-mark)
    (define-key cua--global-mark-keymap [remap kill-ring-save]          
'cua-copy-to-global-mark)
    (define-key cua--global-mark-keymap [remap kill-region]             
'cua-cut-to-global-mark)
--- 358,363 ----