Mercurial > hg > xemacs-beta
view nt/Win32.cf @ 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 | 43dd3413c7c7 |
| children |
line wrap: on
line source
XCOMM platform: $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $ #ifndef OSName #define OSName Microsoft Windows NT 4.0 #endif XCOMM operating system: OSName #ifndef OSMajorVersion #define OSMajorVersion 4 #endif #ifndef OSMinorVersion #define OSMinorVersion 0 #endif #ifndef OSTeenyVersion #define OSTeenyVersion 0 #endif #ifndef CompilerMajorVersion /* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */ #define CompilerMajorVersion 4 #endif #define BootstrapCFlags -DWIN32 #ifdef _M_IX86 #define CpuDefines -D_X86_ #endif /* brain-damaged windows headers will not compile with -Za */ /*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/ /* Try with single threaded libc --marcpa */ #define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines #if CompilerMajorVersion < 4 #define DefaultCCOptions -nologo -batch -G4 -W2 #else #define DefaultCCOptions -nologo -G4 -W2 #endif #if CompilerMajorVersion < 4 #define DebuggableCDebugFlags -Zi #else #define DebuggableCDebugFlags -Zi -Od #endif #define ThreadedX NO #define HasThreadSafeAPI NO #define CpCmd copy #define LnCmd copy #define MvCmd ren #define RmCmd del #ifndef RmTreeCmd /*#define RmTreeCmd del /q /s */ #define RmTreeCmd rm -rf #endif #define CcCmd cl #define HasCplusplus YES #define CplusplusCmd cl #if CompilerMajorVersion < 4 #define PreProcessCmd CcCmd -nologo -batch -EP #define CppCmd CcCmd -nologo -batch -E #else #define PreProcessCmd CcCmd -nologo -EP #define CppCmd CcCmd -nologo -E #endif #define PatheticCpp YES #define ConstructMFLAGS YES #if (CompilerMajorVersion == 0) #define ArCmdBase lib32 #else #define ArCmdBase lib #endif #define ArCmd ArCmdBase #define CplusplusCmd cl #define MkdirHierCmd mkdir #define InstallCmd copy #define InstPgmFlags /**/ #define InstBinFlags /**/ #define InstUidFlags /**/ #define InstLibFlags /**/ #define InstIncFlags /**/ #define InstManFlags /**/ #define InstDatFlags /**/ #define InstallFlags /**/ #if (CompilerMajorVersion == 0) #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib #elif (CompilerMajorVersion < 4) #define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib #else /* Use LIBC.LIB instead of msvcrt.lib since we compile with non-thread version. --marcpa */ #define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc #endif #define MakeCmd nmake -nologo #if (CompilerMajorVersion == 0) #define LdCmd link32 #else #define LdCmd link #endif #define MathLibrary #define HasSymLinks NO #define HasPutenv YES #define Osuf obj #ifndef CCsuf #define CCsuf cxx #endif #define BuildServer NO #define ConnectionFlags -DTCPCONN /* override as necessary in site.def/host.def */ #ifndef StdIncDir #define StdIncDir C:/MSDEVSTD/INCLUDE #endif #define LdPreLib /**/ #define LdPostLib /**/ #ifndef UseInstalled #define ImakeCmd $(IMAKESRC:/=\)\imake #define DependCmd $(DEPENDSRC:/=\)\makedepend #endif #define DependFlags -D_WIN32 #define FilesToClean *.bak *.obj *.lib make.log #define ShLibDir $(BINDIR) #define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S) #define XawI18nDefines -DHAS_WCHAR_H #define UseRgbTxt YES #define HasCbrt NO #define HasFfs NO #define HasXdmAuth NO /* the following components haven't been ported yet */ #define BuildLBX NO #define BuildXprint NO #define XprtServer NO #include <Win32.rules>