[Emacs-diffs] Changes to emacs/lisp/simple.el

[Kim F. Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.543 emacs/lisp/simple.el:1.544
*** emacs/lisp/simple.el:1.543  Sun May 19 23:06:24 2002
--- emacs/lisp/simple.el        Mon May 27 08:13:56 2002
***************
*** 2321,2335 ****
      (goto-char (mark t))
      (pop-mark)))
  
! (defun push-mark-command (arg)
    "Set mark at where point is.
! If no prefix arg and mark is already set there, just activate it."
    (interactive "P")
    (let ((mark (marker-position (mark-marker))))
      (if (or arg (null mark) (/= mark (point)))
!       (push-mark nil nil t)
        (setq mark-active t)
!       (message "Mark activated"))))
  
  (defun set-mark-command (arg)
    "Set mark at where point is, or jump to mark.
--- 2321,2337 ----
      (goto-char (mark t))
      (pop-mark)))
  
! (defun push-mark-command (arg &optional nomsg)
    "Set mark at where point is.
! If no prefix arg and mark is already set there, just activate it.
! Display `Mark set' unless the optional second arg NOMSG is non-nil."
    (interactive "P")
    (let ((mark (marker-position (mark-marker))))
      (if (or arg (null mark) (/= mark (point)))
!       (push-mark nil nomsg t)
        (setq mark-active t)
!       (unless nomsg
!       (message "Mark activated")))))
  
  (defun set-mark-command (arg)
    "Set mark at where point is, or jump to mark.