diff lisp/emacs-lisp/lisp.el @ 89969:3219f94257bc

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-34 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-514 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-522 Update from CVS

--- a/lisp/emacs-lisp/lisp.el	Wed Sep 01 21:21:18 2004 +0000
+++ b/lisp/emacs-lisp/lisp.el	Sat Sep 04 09:14:28 2004 +0000
@@ -176,7 +176,8 @@
 is called as a function to find the defun's beginning."
   (interactive "p")
   (and (eq this-command 'beginning-of-defun)
-       (or (eq last-command 'beginning-of-defun) (push-mark)))
+       (or inhibit-mark-movement (eq last-command 'beginning-of-defun)
+           (push-mark)))
   (and (beginning-of-defun-raw arg)
        (progn (beginning-of-line) t)))
 
@@ -226,7 +227,8 @@
 is called as a function to find the defun's end."
   (interactive "p")
   (and (eq this-command 'end-of-defun)
-       (or (eq last-command 'end-of-defun) (push-mark)))
+       (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)