Mercurial > hg > xemacs-beta
view lwlib/xt-wrappers.h @ 4697:0d6d0edf1253
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.
author | Andreas Roehler <andreas.roehler@online.de> |
---|---|
date | Tue, 22 Sep 2009 21:14:03 +0200 |
parents | 726060ee587c |
children | 2ade80e8c640 |
line wrap: on
line source
/* Wrappers for Xt functions and macros Copyright (C) 2008 Free Software Foundation 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. */ /* Synched up with: Not in FSF. */ /* Original author: Stephen J. Turnbull for 21.5.29 */ /* Generic utility macros, including coping with G++ whining. Used in lwlib via lwlib.h and X consoles via console-x.h. We would prefer to find another way to shut up G++. The issue is that recent versions of the C++ standard deprecate implicit conversions across function boundaries like typedef char *String; void foo (String string); foo ("bar"); because "bar" should be allowed to be a read-only array of chars. But of course lots of legacy code (== X11) declares things as char * and expects to assign literal strings to them. Now, the typedef in the example is important because in G++ 4.3.2 at least, this void foo (const String string); foo ("bar"); does not work as expected! G++ still warns about this construct. However, if foo is declared void foo (const char *string); G++ does not complain. (#### There are two possibilities I can think of. (a) G++ is buggy. (b) "const String" is interpreted as "char * const".) The upshot is that to avoid warnings with Xt's String typedef, we need to arrange to cast literal strings to String, rather than use "const String" in declarations. (My <X11/Intrinsic.h> says that the actual internal typedef used is _XtString, so that String can be #define'd to something else for the purposes of C++. But that doesn't really help us much.) It's not very satisfactory to do it this way -- it would be much better to have const Strings where they make sense -- but it does eliminate a few hundred warnings from the C++ build. And in any case we don't control the many objects declared with String components in Intrinsic.h. The remaining issues are the WEXTTEXT macro used in src/emacs.c, and Emacs.ad.h (where instead of String we use const char * in src/event-Xt.c in the array that #includes it). */ #ifndef INCLUDED_xt_wrappers_h_ #define INCLUDED_xt_wrappers_h_ /* Wrap XtResource, with the same elements as arguments. The cast to String shuts up G++ 4.3's whining about const char *. The invocation of sizeof should be pretty safe, and the cast to XtPointer surely is, since that's how that member of XtResource is declared. It doesn't hide potential problems, because XtPointer is a "generic" type in any case -- the actual object will have a different type, that will be cast to XtPointer. */ #define Xt_RESOURCE(name,_class,intrepr,type,member,extrepr,value) \ { (String) name, (String) _class, (String) intrepr, sizeof(type), \ member, extrepr, (XtPointer) value } /* Wrap XtSetArg, with the same arguments. The cast to String shuts up G++ 4.3's whining about const char *. */ #define Xt_SET_ARG(al, resource, x) do { \ XtSetArg ((al), (String) (resource), (x)); \ } while (0) /* Convenience macros for getting/setting one resource value. */ #define Xt_SET_VALUE(widget, resource, value) do { \ Arg al; \ Xt_SET_ARG (al, resource, value); \ XtSetValues (widget, &al, 1); \ } while (0) #define Xt_GET_VALUE(widget, resource, location) do { \ Arg al; \ Xt_SET_ARG (al, resource, location); \ XtGetValues (widget, &al, 1); \ } while (0) #endif /* INCLUDED_xt_wrappers_h_ */