[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.6 
emacs/lisp/emulation/cua-gmrk.el:1.7
*** emacs/lisp/emulation/cua-gmrk.el:1.6        Mon Jun  6 13:19:15 2005
--- emacs/lisp/emulation/cua-gmrk.el    Thu Jun 30 01:13:21 2005
***************
*** 96,102 ****
  insert the deleted or copied text before the global marker, even when the
  global marker is in another buffer.
  If the global marker isn't set, set the global marker at point in the current
! buffer. Otherwise jump to the global marker position and cancel it.
  With prefix argument, don't jump to global mark when cancelling it."
    (interactive "P")
    (unless cua--global-mark-initialized
--- 96,102 ----
  insert the deleted or copied text before the global marker, even when the
  global marker is in another buffer.
  If the global marker isn't set, set the global marker at point in the current
! buffer.  Otherwise jump to the global marker position and cancel it.
  With prefix argument, don't jump to global mark when cancelling it."
    (interactive "P")
    (unless cua--global-mark-initialized
***************
*** 105,111 ****
        (if (not buffer-read-only)
          (cua--activate-global-mark t)
        (ding)
!       (message "Cannot set global mark in read-only buffer."))
      (when (not stay)
        (pop-to-buffer (marker-buffer cua--global-mark-marker))
        (goto-char cua--global-mark-marker))
--- 105,111 ----
        (if (not buffer-read-only)
          (cua--activate-global-mark t)
        (ding)
!       (message "Cannot set global mark in read-only buffer"))
      (when (not stay)
        (pop-to-buffer (marker-buffer cua--global-mark-marker))
        (goto-char cua--global-mark-marker))
***************
*** 165,171 ****
          (if (equal (marker-buffer cua--global-mark-marker) src-buf)
              (if (and (< start (marker-position cua--global-mark-marker))
                       (< (marker-position cua--global-mark-marker) end))
!                 (message "Can't move region into itself.")
                (let ((text (buffer-substring-no-properties start end))
                      (p1 (copy-marker start))
                      (p2 (copy-marker end)))
--- 165,171 ----
          (if (equal (marker-buffer cua--global-mark-marker) src-buf)
              (if (and (< start (marker-position cua--global-mark-marker))
                       (< (marker-position cua--global-mark-marker) end))
!                 (message "Can't move region into itself")
                (let ((text (buffer-substring-no-properties start end))
                      (p1 (copy-marker start))
                      (p2 (copy-marker end)))
***************
*** 222,228 ****
                      (setq in-rect t olist nil)
                    (setq olist (cdr olist))))
                (if in-rect
!                   (message "Can't move rectangle into itself.")
                  (let ((text (cua--extract-rectangle)))
                    (cua--delete-rectangle)
                    (goto-char (marker-position cua--global-mark-marker))
--- 222,228 ----
                      (setq in-rect t olist nil)
                    (setq olist (cdr olist))))
                (if in-rect
!                   (message "Can't move rectangle into itself")
                  (let ((text (cua--extract-rectangle)))
                    (cua--delete-rectangle)
                    (goto-char (marker-position cua--global-mark-marker))