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

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.60 emacs/lisp/emacs-lisp/lisp.el:1.61
*** emacs/lisp/emacs-lisp/lisp.el:1.60  Tue Dec 14 12:18:11 2004
--- emacs/lisp/emacs-lisp/lisp.el       Wed Dec 29 01:32:06 2004
***************
*** 69,83 ****
    (or arg (setq arg 1))
    (forward-sexp (- arg)))
  
! (defun mark-sexp (&optional arg)
    "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
--- 69,85 ----
    (or arg (setq arg 1))
    (forward-sexp (- arg)))
  
! (defun mark-sexp (&optional arg allow-extend)
    "Set mark ARG sexps from point.
  The place mark goes is the same place \\[forward-sexp] would
  move to with the same argument.
! Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active, 
  it marks the next ARG sexps after the ones already marked."
!   (interactive "P\np")
!   (cond ((and allow-extend
!             (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
***************
*** 289,302 ****
                (goto-char (point-min)))))
        (setq arg (1+ arg))))))
  
! (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))
--- 291,307 ----
                (goto-char (point-min)))))
        (setq arg (1+ arg))))))
  
! (defun mark-defun (&optional allow-extend)
    "Put mark at end of this defun, point at beginning.
  The defun marked is the one that contains point or follows point.
! 
! Interactively, if this command is repeated
! or (in Transient Mark mode) if the mark is active, 
! it marks the next defun after the ones already marked."
!   (interactive "p")
!   (cond ((and allow-extend
!             (or (and (eq last-command this-command) (mark t))
!                 (and transient-mark-mode mark-active)))
         (set-mark
          (save-excursion
            (goto-char (mark))