Mercurial > emacs
comparison lisp/emacs-lisp/lisp.el @ 58962:eb752b1a84b1
(beginning-of-defun, end-of-defun): Don't
use inhibit-mark-movement.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 14 Dec 2004 12:18:11 +0000 |
parents | 2ee970dcd072 |
children | 5188f5b11d56 eac554634bfa |
comparison
equal
deleted
inserted
replaced
58961:2a281af9d3ad | 58962:eb752b1a84b1 |
---|---|
190 open-parenthesis, and point ends up at the beginning of the line. | 190 open-parenthesis, and point ends up at the beginning of the line. |
191 | 191 |
192 If variable `beginning-of-defun-function' is non-nil, its value | 192 If variable `beginning-of-defun-function' is non-nil, its value |
193 is called as a function to find the defun's beginning." | 193 is called as a function to find the defun's beginning." |
194 (interactive "p") | 194 (interactive "p") |
195 (or inhibit-mark-movement | 195 (or (not (eq this-command 'beginning-of-defun)) |
196 (not (eq this-command 'beginning-of-defun)) | |
197 (eq last-command 'beginning-of-defun) | 196 (eq last-command 'beginning-of-defun) |
198 (and transient-mark-mode mark-active) | 197 (and transient-mark-mode mark-active) |
199 (push-mark)) | 198 (push-mark)) |
200 (and (beginning-of-defun-raw arg) | 199 (and (beginning-of-defun-raw arg) |
201 (progn (beginning-of-line) t))) | 200 (progn (beginning-of-line) t))) |
243 `beginning-of-defun'. | 242 `beginning-of-defun'. |
244 | 243 |
245 If variable `end-of-defun-function' is non-nil, its value | 244 If variable `end-of-defun-function' is non-nil, its value |
246 is called as a function to find the defun's end." | 245 is called as a function to find the defun's end." |
247 (interactive "p") | 246 (interactive "p") |
248 (or inhibit-mark-movement | 247 (or (not (eq this-command 'end-of-defun)) |
249 (not (eq this-command 'end-of-defun)) | |
250 (eq last-command 'end-of-defun) | 248 (eq last-command 'end-of-defun) |
251 (and transient-mark-mode mark-active) | 249 (and transient-mark-mode mark-active) |
252 (push-mark)) | 250 (push-mark)) |
253 (if (or (null arg) (= arg 0)) (setq arg 1)) | 251 (if (or (null arg) (= arg 0)) (setq arg 1)) |
254 (if end-of-defun-function | 252 (if end-of-defun-function |