Mercurial > hg > xemacs-beta
view lwlib/xlwgcs.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 | c33ae14dd6d0 |
| children | 5460287a3327 |
line wrap: on
line source
/* Tabs 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. */ /* Synched up with: Gcs 1.7 */ #ifndef GCS_H #define GCS_H /* Overview of functions provided here: * * AllocFgGC() * Given a foreground pixel & a font, return an appropriate GC * * AllocBackgroundGC() * Given a widget, return a GC for painting the background color * * AllocShadeGC() * Given foreground, background, a contrast value & be_nice_to_colormap * flag, return a GC suitable for rendering in an intermediate color, * as determined by contrast. May return a dither pattern or a * solid color, as appropriate. * * Contrast 0 = background color, 100 = foreground color. It is legal * for contrast to be more than 100 or less than 0. * * AllocGreyGC() * Given widget, foreground, font, contrast & be_nice_to_colormap, * return a shade GC (see above) based on foreground and widget * background. * * AllocTopShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the top shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use brighter * colors. * * AllocBotShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the bottom shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocArmShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the "armed" shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocShadowPixel() * Given a widget & scale factor, allocate & return a color darker * or lighter than the background pixel, as determined by scale. * * Scale 100 = use background pixel. Scale > 100 = brighter color, * Scale < 100 = darker color. * * AllocGreyPixel() * Given two pixel values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * * AllocGreyPixelC() * Given two color values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * Draw3dBox() * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, * draw a 3-d box. */ #if NeedFunctionPrototypes extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; extern GC AllocBackgroundGC( Widget w, Font font) ; extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, int contrast, Bool ) ; extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; extern GC AllocArmGC( Widget w, int contrast, int) ; extern Pixel AllocShadowPixel(Widget, int scale) ; extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; #if XtSpecificationRelease < 5 extern GC XtAllocateGC(Widget, int depth, unsigned long mask, XGCValues *, unsigned long dynamic, unsigned long dontcare) ; #endif #else extern GC AllocFgGC() ; extern GC AllocBackgroundGC() ; extern GC AllocShadeGC() ; extern GC AllocGreyGC() ; extern GC AllocTopShadowGC() ; extern GC AllocBotShadowGC() ; extern GC AllocArmGC() ; extern Pixel AllocShadowPixel() ; extern Pixel AllocGreyPixel() ; extern Pixel AllocGreyPixelC() ; extern void Draw3dBox() ; #if XtSpecificationRelease < 5 extern GC XtAllocateGC() ; #endif #endif #endif /* GCS_H */