comparison lisp/emacs-lisp/lisp.el @ 56876:3dcc647295da

(beginning-of-defun, end-of-defun): Do not push mark if inhibit-mark-movement is non-nil.

56875:db0f95a55fd4

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 (eq last-command 'beginning-of-defun) (push-mark)))
  (and (beginning-of-defun-raw arg)
       (progn (beginning-of-line) t)))

(defun beginning-of-defun-raw (&optional arg)
  "Move point to the character that starts a defun.

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 (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)
	  (dotimes (i arg)
	    (funcall end-of-defun-function))

56876:3dcc647295da

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)))

(defun beginning-of-defun-raw (&optional arg)
  "Move point to the character that starts a defun.

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)
	  (dotimes (i arg)
	    (funcall end-of-defun-function))