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.

/* Radio Widget for XEmacs.
   Copyright (C) 1999 Edward A. Falk

This file is part of XEmacs.

XEmacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.

XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
for more details.

You should have received a copy of the GNU General Public License
along with XEmacs; see the file COPYING.  If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */

/*
 * RadioP.h - Private definitions for Radio widget
 * 
 * Author: Edward A. Falk
 *         falk@falconer.vip.best.com
 *  
 * Date:   June 30, 1997
 *
 */

#ifndef _XawRadioP_h
#define _XawRadioP_h

#include "xlwradio.h"
#include ATHENA_ToggleP_h_

/***********************************************************************
 *
 * Radio Widget Private Data
 *
 ***********************************************************************/

/* Already in Xaw/ToggleP.h, and not used by us.
  #define streq(a, b) ( strcmp((a), (b)) == 0 )
*/

typedef void (*XawDiamondProc) (Widget);

void RadioSet (Widget   w,
	       XEvent   *event,
	       String   *params,      /* unused */
	       Cardinal *num_params); /* unused */

void RadioUnset (Widget   w,
		 XEvent   *event,
		 String   *params,      /* unused */
		 Cardinal *num_params); /* unused */

/************************************
 *
 *  Class structure
 *
 ***********************************/

   /* New fields for the Radio widget class record */
typedef struct _RadioClass  {
    Dimension	dsize ;		/* diamond size */
    XawDiamondProc drawDiamond ;
    /* TODO: 3-d and xaw-xpm features? */
    XtPointer	extension;
} RadioClassPart;

#define	XtInheritDrawDiamond	((XawDiamondProc)_XtInherit)

   /* Full class record declaration */
typedef struct _RadioClassRec {
    CoreClassPart	core_class;
    SimpleClassPart	simple_class;
#ifdef	_ThreeDP_h
    ThreeDClassPart	threeD_class;
#endif
    LabelClassPart	label_class;
    CommandClassPart	command_class;
    ToggleClassPart	toggle_class;
    RadioClassPart	radio_class;
} RadioClassRec;

extern RadioClassRec radioClassRec;

/***************************************
 *
 *  Instance (widget) structure 
 *
 **************************************/

    /* New fields for the Radio widget record */
typedef struct {
    /* resources */
    /* TODO: 3-d and xaw-xpm features? */

    /* private data */
    XtPointer	extension;
} RadioPart;

   /* Full widget declaration */
typedef struct _RadioRec {
    CorePart	core;
    SimplePart	simple;
#ifdef	_ThreeDP_h
    ThreeDPart	threeD;
#endif
    LabelPart	label;
    CommandPart	command;
    TogglePart	toggle;
    RadioPart	radio;
} RadioRec;

#endif /* _XawRadioP_h */