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

[Juanma Barranquero]

Index: emacs/lisp/emulation/cua-gmrk.el
diff -c emacs/lisp/emulation/cua-gmrk.el:1.3 
emacs/lisp/emulation/cua-gmrk.el:1.4
*** emacs/lisp/emulation/cua-gmrk.el:1.3        Fri May 24 20:07:26 2002
--- emacs/lisp/emulation/cua-gmrk.el    Tue Feb  4 07:56:02 2003
***************
*** 33,39 ****
    (require 'cua-rect)
    )
  
! ;;; Global Marker 
  
  ;; Non-nil when global marker is active.
  (defvar cua--global-mark-active nil)
--- 33,39 ----
    (require 'cua-rect)
    )
  
! ;;; Global Marker
  
  ;; Non-nil when global marker is active.
  (defvar cua--global-mark-active nil)
***************
*** 72,83 ****
    (move-marker cua--global-mark-marker (point))
    (if (overlayp cua--global-mark-overlay)
        (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 
            blink-cursor-interval cua-global-mark-blink-cursor-interval))
    (setq cua--global-mark-active t)
    (if msg
--- 72,83 ----
    (move-marker cua--global-mark-marker (point))
    (if (overlayp cua--global-mark-overlay)
        (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
            blink-cursor-interval cua-global-mark-blink-cursor-interval))
    (setq cua--global-mark-active t)
    (if msg
***************
*** 325,331 ****
              (move-to-column col)
              (move-marker cua--global-mark-marker (point))
              (move-overlay cua--global-mark-overlay (point) (1+ (point))))))))
!           
  
  (defun cua-cancel-global-mark ()
    "Cancel the global mark."
--- 325,331 ----
              (move-to-column col)
              (move-marker cua--global-mark-marker (point))
              (move-overlay cua--global-mark-overlay (point) (1+ (point))))))))
! 
  
  (defun cua-cancel-global-mark ()
    "Cancel the global mark."
***************
*** 346,352 ****
      (if (or (not (eq (current-buffer) (marker-buffer 
cua--global-mark-marker)))
            (not (pos-visible-in-window-p (marker-position 
cua--global-mark-marker))))
        (let ((w (selected-window)) (p (point)) h)
!         ;; The following code is an attempt to keep the global mark visible 
in 
          ;; other window -- but it doesn't work.
          (switch-to-buffer-other-window (marker-buffer 
cua--global-mark-marker) t)
          (goto-char (marker-position cua--global-mark-marker))
--- 346,352 ----
      (if (or (not (eq (current-buffer) (marker-buffer 
cua--global-mark-marker)))
            (not (pos-visible-in-window-p (marker-position 
cua--global-mark-marker))))
        (let ((w (selected-window)) (p (point)) h)
!         ;; The following code is an attempt to keep the global mark visible in
          ;; other window -- but it doesn't work.
          (switch-to-buffer-other-window (marker-buffer 
cua--global-mark-marker) t)
          (goto-char (marker-position cua--global-mark-marker))