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

[Kim F . Storm]

Index: emacs/lisp/emacs-lisp/lisp.el
diff -c emacs/lisp/emacs-lisp/lisp.el:1.59 emacs/lisp/emacs-lisp/lisp.el:1.60
*** emacs/lisp/emacs-lisp/lisp.el:1.59  Mon Dec 13 03:09:59 2004
--- emacs/lisp/emacs-lisp/lisp.el       Tue Dec 14 12:18:11 2004
***************
*** 192,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")
!   (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))
--- 192,198 ----
  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 (not (eq this-command 'beginning-of-defun))
        (eq last-command 'beginning-of-defun)
        (and transient-mark-mode mark-active)
        (push-mark))
***************
*** 245,252 ****
  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))
--- 244,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")
!   (or (not (eq this-command 'end-of-defun))
        (eq last-command 'end-of-defun)
        (and transient-mark-mode mark-active)
        (push-mark))