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

[Kai Großjohann]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.44 emacs/lisp/emacs-lisp/lisp.el:1.45
*** emacs/lisp/emacs-lisp/lisp.el:1.44  Fri Jan 11 16:22:28 2002
--- emacs/lisp/emacs-lisp/lisp.el       Fri Feb 15 03:53:15 2002
***************
*** 76,88 ****
  If this command is repeated, it marks the next ARG sexps after the ones
  already marked."
    (interactive "p")
!   (push-mark
!     (save-excursion
!       (if (and (eq last-command this-command) (mark t))
!         (goto-char (mark)))
!       (forward-sexp (or arg 1))
!       (point))
!     nil t))
  
  (defun forward-list (&optional arg)
    "Move forward across one balanced group of parentheses.
--- 76,93 ----
  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))
!        (set-mark
!         (save-excursion
!          (goto-char (mark))
!          (forward-sexp (or arg 1))
!          (point))))
!       (t
!        (push-mark
!         (save-excursion
!           (forward-sexp (or arg 1))
!           (point))
!         nil t))))
  
  (defun forward-list (&optional arg)
    "Move forward across one balanced group of parentheses.
***************
*** 250,262 ****
  
  (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."
    (interactive)
!   (push-mark (point))
!   (end-of-defun)
!   (push-mark (point) nil t)
!   (beginning-of-defun)
!   (re-search-backward "^\n" (- (point) 1) t))
  
  (defun narrow-to-defun (&optional arg)
    "Make text outside current defun invisible.
--- 255,275 ----
  
  (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)
!   (let (here)
!     (when (and (eq last-command this-command) (mark t))
!       (setq here (point))
!       (goto-char (mark)))
!     (push-mark (point))
!     (end-of-defun)
!     (push-mark (point) nil t)
!     (if here
!       (goto-char here)
!       (beginning-of-defun)
!       (re-search-backward "^\n" (- (point) 1) t))))
  
  (defun narrow-to-defun (&optional arg)
    "Make text outside current defun invisible.