lisp beginning-end-of-defun-function Changelog entry hg diff diff -r ecc468b62551 lisp/ChangeLog --- a/lisp/ChangeLog Mon Sep 21 21:40:35 2009 +0200 +++ b/lisp/ChangeLog Tue Sep 22 21:11:51 2009 +0200 @@ -1,3 +1,12 @@ 2009-09-20 Aidan Kehoe <kehoea@parhasa +2009-09-22 Andreas Roehler <andreas.roehler@online.de> + + * lisp.el (beginning-of-defun-raw): + new variable: beginning-of-defun-function, + beginning-of-defun may call FUNCTION determining start position + * lisp.el (end-of-defun): + new variable: end-of-defun-function, + end-of-defun may call FUNCTION determining the end position + ;;;;;;;;;;;;;;;;;;;;;;;; hg diff -p -r 4695 -r 4696 diff -r fee33ab25966 -r ecc468b62551 lisp/lisp.el --- a/lisp/lisp.el Sun Sep 20 23:50:05 2009 +0100 +++ b/lisp/lisp.el Mon Sep 21 21:40:35 2009 +0200 @@ -155,6 +155,21 @@ Negative arg -N means kill N sexps after (interactive "p") (kill-sexp (- (or arg 1)))) + +;; derived stuff from GNU Emacs +(defvar beginning-of-defun-function nil + "If non-nil, function for `beginning-of-defun-raw' to call. +This is used to find the beginning of the defun instead of using the +normal recipe (see `beginning-of-defun'). Modes can define this +if defining `defun-prompt-regexp' is not sufficient to handle the mode's +needs.") + +(defvar end-of-defun-function nil + "If non-nil, function for `end-of-defun' to call. +This is used to find the end of the defun instead of using the normal +recipe (see `end-of-defun'). Modes can define this if the +normal method is not appropriate.") + (defun beginning-of-defun (&optional arg) "Move backward to the beginning of a defun. With argument, do it that many times. Negative arg -N @@ -175,13 +190,17 @@ This is identical to beginning-of-defun, This is identical to beginning-of-defun, except that point does not move to the beginning of the line when `defun-prompt-regexp' is non-nil." (interactive "p") - (and arg (< arg 0) (not (eobp)) (forward-char 1)) - (and (re-search-backward (if defun-prompt-regexp - (concat "^\\s(\\|" - "\\(" defun-prompt-regexp "\\)\\s(") - "^\\s(") - nil 'move (or arg 1)) - (progn (goto-char (1- (match-end 0)))) t)) + ;; (and arg (< arg 0) (not (eobp)) (forward-char 1)) + (unless arg (setq arg 1)) + (cond + (beginning-of-defun-function + (funcall beginning-of-defun-function arg)) + (t (re-search-backward (if defun-prompt-regexp + (concat "^\\s(\\|" + "\\(" defun-prompt-regexp "\\)\\s(") + "^\\s(") + nil 'move (or arg 1)) + (progn (goto-char (1- (match-end 0)))) t))) ;; XEmacs change (optional buffer parameter) (defun buffer-end (arg &optional buffer) @@ -198,6 +217,10 @@ the open-parenthesis that starts a defun ;; XEmacs change (for zmacs regions) (interactive "_p") (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))) (let ((first t)) (while (and (> arg 0) (< (point) (point-max))) (let ((pos (point))) ; XEmacs -- remove unused npos. @@ -229,7 +252,7 @@ the open-parenthesis that starts a defun (if (looking-at "\\s<\\|\n") (forward-line 1))) (goto-char (point-min))))) - (setq arg (1+ arg))))) + (setq arg (1+ arg)))))) (defun mark-defun () "Put mark at end of this defun, point at beginning.

/* XPM */
static char *XEmacs48_xpm[] = {
/* width height ncolors chars_per_pixel */
"48 48 12 1",
/* colors */
"a c #ADADADADADAD m white",
"b c #737373737373 m black",
"c c #636363636363 m black",
"d c #424242424242 m black",
"  c #DEDEDEDEDEDE m white s BgColor",
"g c #FFFF00000000 m black",
"h c #949494949494 m black",
"i c #636363636363 m black",
"j c #FFFFFFFFFFFF m white",
"k c #FFFFFFFF0000 m white",
"l c #DEDEDEDEDEDE m white",
"m c #BDBDBDBDBDBD m white",
/* pixels */
"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjc",
"j                                             mc",
"j                                             mc",
"j                                             mc",
"j          cccccccccccccccccccccccccccccccci  mc",
"j          cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjji  mc",
"j          cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j          cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j          cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j          cjjjjjjjmmmiibiibmmbbmmjjjjjjjjjia mc",
"j          cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j  jjjjjjd cjjjjjjdjjjjjjjjjjjjdjjjjjjjjjjjia mc",
"j  jgggggd cjgggggdjjggggggggggdiibmmjjjjjjia mc",
"j   jggggd cjggggdjjjggggggggggdjjjjjjjjjjjia mc",
"j   jgggggdjgggggdaajggggggggggdaaajjjjjjjjia mc",
"j    jggggdjggggdaaajgggggddddddaaabbibbmjjia mc",
"j    jggggggggggdaakjgggggdkkkkakkkkkkkkkjjia mc",
"j     jggggggggdaaakjgggggdjjjjjkkkkkkkkkjjia mc",
"j     jggggggggdaaakjggggggggggdaaammkkkkjjia mc",
"j      jggggggdaaaakjggggggggggdkkkkkkkkkjjia mc",
"j     jggggggggdaaakjggggggggggdkkkkkkkkkjjia mc",
"j     jggggggggdaalljgggggddddddaaibbbmmjjjia mc",
"j    jggggggggggdaaljgggggdaaaaaaaajjjjjjjjia mc",
"j    jggggddggggdaaljgggggdjjjjjaaajjjjjjjjia mc",
"j   jgggggdjgggggdaajggggggggggdaaammmjjjjjia mc",
"j   jggggdaajggggdaajggggggggggdjjjjjjjjjjjia mc",
"j  jgggggdaajgggggdajggggggggggdiiibbbbbijjia mc",
"j  dddddddaadddddddaddddddddddddaaajjjjjjjjia mc",
"j      aaaaacjjjaaaaaajjaaiiiiaaiiibbbbbijjia mc",
"j      aaaaacjjjaaaaaajjaaaaaaaaaaajjjjjjjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjjjjjjjjjiimbbbimmbmmjjjjjjia mc",
"j           cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjgggggmbbbmmibbbmjjjjjjjjjjjia mc",
"j           cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjjjjjjjjjjjmbbimaabbbmjjjjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjibbbmmmjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
"j           iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiia mc",
"j             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa mc",
"j                                             mc",
"jmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc",
"cccccccccccccccccccccccccccccccccccccccccccccccc"
};