Mercurial > hg > xemacs-beta
view lib-src/yow.c @ 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 | 943eaba38521 |
children |
line wrap: on
line source
/* * yow.c * * Print a quotation from Zippy the Pinhead. * Qux <Kaufman-David@Yale> March 6, 1986 * * With dynamic memory allocation. */ /* Synched up with: FSF 19.28. */ #include <config.h> #include <stdio.h> #include <ctype.h> #include <../src/paths.h> /* For PATH_DATA. */ #if __STDC__ || defined(STDC_HEADERS) #include <stdlib.h> #include <unistd.h> #include <string.h> #include <time.h> /* for time() */ #endif #define BUFSIZE 80 #define SEP '\0' #ifndef YOW_FILE #define YOW_FILE "yow.lines" #endif void yow (FILE *fp); void setup_yow (FILE *fp); #ifdef WIN32_NATIVE #define rootrelativepath(rel) \ ({\ static char res[BUFSIZE], *p;\ strcpy (res, argv[0]);\ p = res + strlen (res);\ while (p != res && *p != '/' && *p != '\\' && *p != ':') p--;\ strcpy (p + 1, "../");\ strcpy (p + 4, rel);\ &res;}) #endif int main (int argc, char *argv[]) { FILE *fp; char file[BUFSIZ]; if (argc > 2 && !strcmp (argv[1], "-f")) strcpy (file, argv[2]); else #ifdef PATH_DATA #ifdef vms sprintf (file, "%s%s", PATH_DATA, YOW_FILE); #else sprintf (file, "%s/%s", PATH_DATA, YOW_FILE); #endif #else /* !PATH_DATA */ { fprintf (stderr, "%s: the location of the \"%s\" file was not supplied at compile-time.\n\ You must supply it with the -f command-line option.\n", argv[0], YOW_FILE); exit (1); } #endif if ((fp = fopen(file, "r")) == NULL) { perror(file); exit(1); } /* initialize random seed */ srand((int) (getpid() + time((time_t *) 0))); setup_yow(fp); yow(fp); fclose(fp); return 0; } static long len = -1; static long header_len; #define AVG_LEN 40 /* average length of a quotation */ /* Sets len and header_len */ void setup_yow (FILE *fp) { int c; /* Get length of file */ /* Because the header (stuff before the first SEP) can be very long, * thus biasing our search in favor of the first quotation in the file, * we explicitly skip that. */ while ((c = getc(fp)) != SEP) { if (c == EOF) { fprintf(stderr, "File contains no separators.\n"); exit(2); } } header_len = ftell(fp); if (header_len > AVG_LEN) header_len -= AVG_LEN; /* allow the first quotation to appear */ if (fseek(fp, 0L, 2) == -1) { perror("fseek 1"); exit(1); } len = ftell(fp) - header_len; } /* go to a random place in the file and print the quotation there */ void yow (FILE *fp) { long offset; int c, i = 0; char *buf; int bufsize; offset = rand() % len + header_len; if (fseek(fp, offset, 0) == -1) { perror("fseek 2"); exit(1); } /* Read until SEP, read next line, print it. (Note that we will never print anything before the first separator.) If we hit EOF looking for the first SEP, just recurse. */ while ((c = getc(fp)) != SEP) if (c == EOF) { yow(fp); return; } /* Skip leading whitespace, then read in a quotation. If we hit EOF before we find a non-whitespace char, recurse. */ while (isspace(c = getc(fp))) ; if (c == EOF) { yow(fp); return; } bufsize = BUFSIZE; buf = (char *) malloc(bufsize); if (buf == (char *)0) { fprintf(stderr, "can't allocate any memory\n"); exit (3); } buf[i++] = c; while ((c = getc(fp)) != SEP && c != EOF) { buf[i++] = c; if (i == bufsize-1) { /* Yow! Is this quotation too long yet? */ bufsize *= 2; buf = (char *)realloc(buf, bufsize); if (buf == (char *)0) { fprintf(stderr, "can't allocate more memory\n"); exit (3); } } } buf[i++] = 0; printf("%s\n", buf); }