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.

		DYNODUMP
		--------

Dynodump, not to be confused with DinoTurd (as seen in Jurassic Park),
is a shared object that provides one function:

	int dynodump(char *new_file);

dynodump(), called from a running program will write a new executable
in new_file a la unexec() in GNU Emacs.  The difference lies in the
relocations.

dynodump() will create an image with any relocations (which were
performed by the run-time dynamic linker) undone.  This allows the new
image to be run in a different environment.  There is, however, one
potentially major caveat.  If a symbol reference gets updated during
the running of the calling program, its updated value will be lost.
An example (with additional blank lines for legibility):

	$ cat lib.c
	char _foo[] = "hello";
	char _bar[] = "world";

	$ cc -G -o lib.so lib.c

	$ cat prog.c
	extern char _foo, _bar;
 
	int beenhere = 0;
	char * foo = &_foo;
	char * bar = &_bar;
 
	int
	main(void)
	{
	    (void) printf("%d: foo = %x\n", beenhere, foo);
	    (void) printf("%d: bar = %x, ", beenhere, bar);
 
	    if (!beenhere) {
	        beenhere = 1;
	        bar++;
	        dynodump("newfile");
	    }
	    (void) printf("%x\n", bar);
	}

	$ cc -o prog prog.c -R. lib.so dynodump.so

	$ ./prog
	0: foo = ef7503cc
	0: bar = ef7503d2, ef7503d3

	$ ./newfile
	1: foo = ef7503cc
	1: bar = ef7503d2, ef7503d2

Notice that in the run of newfile, bar points at "world" instead of
the perhaps expected "orld".

Dynodump supports sparc, intel, and power pc architectures.

Dynodump is buildable with GNU make and gcc.  If it works for you
with these tools, let me know.

unexec()
--------

Also supplied is an unexsol2.c which belongs in the XEmacs src
directory with the other unex*.c files.  The src/s/sol2.h should be
have the following added to it:

	#ifdef UNEXEC
	#undef UNEXEC
	#endif
	#define UNEXEC unexsol2.o

This unexec() will attempt to dlopen() the dynodump.so to find the
dynodump function.  The default is "../dynodump/dynodump.so" which
should be appropriate for the typical XEmacs build (unless you used
configure to set up separate build and source trees).  You may change
it by setting the DYNODUMP environment variable to the full path of
the dynodump shared object.

Other notes:

If you're using the 4.0 C compiler from Sun, you should arrange to
shut off the incremental linker.  This is done with the -xildoff
option to the compiler.  The common.mk and testsuite/Makefile files
have commentary and ready made lines for uncommenting for this
purpose.

If you're interested in playing with the UltraSPARC specific options
to the aforementioned compiler, then the same makefiles have some
commentary and flags settings to point you in that direction.

Questions:

dynodump() was developed by Rod.Evans@Eng.Sun.COM and
Georg.Nikodym@Canada.Sun.COM.  If you have questions, feel free to ask
them but be aware that Rod, "don't know jack about emacs."