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

[Juri Linkov]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.58 emacs/lisp/emacs-lisp/lisp.el:1.59
*** emacs/lisp/emacs-lisp/lisp.el:1.58  Tue Oct 12 16:05:55 2004
--- emacs/lisp/emacs-lisp/lisp.el       Mon Dec 13 03:09:59 2004
***************
*** 73,89 ****
    "Set mark ARG sexps from point.
  The place mark goes is the same place \\[forward-sexp] would
  move to with the same argument.
! If this command is repeated, it marks the next ARG sexps after the ones
! already marked."
    (interactive "P")
!   (cond ((and (eq last-command this-command) (mark t))
         (setq arg (if arg (prefix-numeric-value arg)
!                    (if (> (mark) (point)) 1 -1)))
         (set-mark
          (save-excursion
!          (goto-char (mark))
!          (forward-sexp arg)
!          (point))))
        (t
         (push-mark
          (save-excursion
--- 73,90 ----
    "Set mark ARG sexps from point.
  The place mark goes is the same place \\[forward-sexp] would
  move to with the same argument.
! If this command is repeated or mark is active in Transient Mark mode,
! it marks the next ARG sexps after the ones already marked."
    (interactive "P")
!   (cond ((or (and (eq last-command this-command) (mark t))
!            (and transient-mark-mode mark-active))
         (setq arg (if arg (prefix-numeric-value arg)
!                    (if (< (mark) (point)) -1 1)))
         (set-mark
          (save-excursion
!           (goto-char (mark))
!           (forward-sexp arg)
!           (point))))
        (t
         (push-mark
          (save-excursion
***************
*** 191,199 ****
  If variable `beginning-of-defun-function' is non-nil, its value
  is called as a function to find the defun's beginning."
    (interactive "p")
!   (and (eq this-command 'beginning-of-defun)
!        (or inhibit-mark-movement (eq last-command 'beginning-of-defun)
!            (push-mark)))
    (and (beginning-of-defun-raw arg)
         (progn (beginning-of-line) t)))
  
--- 192,202 ----
  If variable `beginning-of-defun-function' is non-nil, its value
  is called as a function to find the defun's beginning."
    (interactive "p")
!   (or inhibit-mark-movement
!       (not (eq this-command 'beginning-of-defun))
!       (eq last-command 'beginning-of-defun)
!       (and transient-mark-mode mark-active)
!       (push-mark))
    (and (beginning-of-defun-raw arg)
         (progn (beginning-of-line) t)))
  
***************
*** 242,250 ****
  If variable `end-of-defun-function' is non-nil, its value
  is called as a function to find the defun's end."
    (interactive "p")
!   (and (eq this-command 'end-of-defun)
!        (or inhibit-mark-movement (eq last-command 'end-of-defun)
!            (push-mark)))
    (if (or (null arg) (= arg 0)) (setq arg 1))
    (if end-of-defun-function
        (if (> arg 0)
--- 245,255 ----
  If variable `end-of-defun-function' is non-nil, its value
  is called as a function to find the defun's end."
    (interactive "p")
!   (or inhibit-mark-movement
!       (not (eq this-command 'end-of-defun))
!       (eq last-command 'end-of-defun)
!       (and transient-mark-mode mark-active)
!       (push-mark))
    (if (or (null arg) (= arg 0)) (setq arg 1))
    (if end-of-defun-function
        (if (> arg 0)
***************
*** 289,298 ****
  (defun mark-defun ()
    "Put mark at end of this defun, point at beginning.
  The defun marked is the one that contains point or follows point.
! If this command is repeated, marks more defuns after the ones
! already marked."
    (interactive)
!   (cond ((and (eq last-command this-command) (mark t))
         (set-mark
          (save-excursion
            (goto-char (mark))
--- 294,304 ----
  (defun mark-defun ()
    "Put mark at end of this defun, point at beginning.
  The defun marked is the one that contains point or follows point.
! If this command is repeated or mark is active in Transient Mark mode,
! it marks more defuns after the ones already marked."
    (interactive)
!   (cond ((or (and (eq last-command this-command) (mark t))
!            (and transient-mark-mode mark-active))
         (set-mark
          (save-excursion
            (goto-char (mark))