diff options
| -rw-r--r-- | ispell.c | 4 | ||||
| -rw-r--r-- | lisp/modules/progmodes/patch.lsp | 55 | ||||
| -rw-r--r-- | lisp/modules/xedit.lsp | 5 | ||||
| -rw-r--r-- | lisp/private.h | 10 |
4 files changed, 71 insertions, 3 deletions
@@ -27,7 +27,8 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/ispell.c,v 1.19 2002/10/19 20:04:20 herrb Exp $ */ +/* $XdotOrg: xc/programs/xedit/ispell.c,v 1.20 2003/12/19 02:05:39 dawes Exp $ */ +/* $XFree86: xc/programs/xedit/ispell.c,v 1.20 2003/12/19 02:05:39 dawes Exp $ */ #include "xedit.h" #include <stdlib.h> @@ -42,6 +43,7 @@ #include <X11/Xaw/MenuButton.h> #include <X11/Xaw/SmeBSB.h> #include <X11/Xaw/SimpleMenu.h> +#include <X11/Xos.h> #define RECEIVE 1 #define SEND 2 diff --git a/lisp/modules/progmodes/patch.lsp b/lisp/modules/progmodes/patch.lsp new file mode 100644 index 0000000..4d4d8e3 --- /dev/null +++ b/lisp/modules/progmodes/patch.lsp @@ -0,0 +1,55 @@ +;; +;; Copyright (c) 2003 by The XFree86 Project, Inc. +;; +;; Permission is hereby granted, free of charge, to any person obtaining a +;; copy of this software and associated documentation files (the "Software"), +;; to deal in the Software without restriction, including without limitation +;; the rights to use, copy, modify, merge, publish, distribute, sublicense, +;; and/or sell copies of the Software, and to permit persons to whom the +;; Software is furnished to do so, subject to the following conditions: +;; +;; The above copyright notice and this permission notice shall be included in +;; all copies or substantial portions of the Software. +;; +;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +;; THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +;; WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +;; OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +;; SOFTWARE. +;; +;; Except as contained in this notice, the name of the XFree86 Project shall +;; not be used in advertising or otherwise to promote the sale, use or other +;; dealings in this Software without prior written authorization from the +;; XFree86 Project. +;; +;; Author: Paulo César Pereira de Andrade +;; +;; +;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/patch.lsp,v 1.1 2003/12/11 16:03:31 paulo Exp $ +;; + +(require "syntax") +(require "indent") +(in-package "XEDIT") + +(defsyntax *patch-mode* :main nil #'default-indent nil + ;; "normal" diff + (syntoken "^(\\d+d\\d+|\\d+a\\d+,\\d+)$" :property *prop-keyword*) + (syntoken "^<.*" :property *prop-constant*) + (syntoken "^>.*" :property *prop-preprocessor*) + + ;; context diff + (syntoken "^\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*\\*" + :property *prop-string*) + (syntoken "^\\*\\*\\* \\d+,\\d+ \\*\\*\\*\\*" :property *prop-comment*) + (syntoken "^--- \\d+,\\d+ ----" :property *prop-comment*) + + ;; headers + (syntoken "^(---|\\+\\+\\+|\\*\\*\\*).*" :property *prop-keyword*) + + (syntoken "^@@ .*" :property *prop-comment*) + (syntoken "^-.*" :property *prop-constant*) + (syntoken "^\\+.*" :property *prop-preprocessor*) +) diff --git a/lisp/modules/xedit.lsp b/lisp/modules/xedit.lsp index 87a85c7..b328733 100644 --- a/lisp/modules/xedit.lsp +++ b/lisp/modules/xedit.lsp @@ -27,7 +27,8 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.10 2003/01/16 06:25:50 paulo Exp $ +;; $XdotOrg: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.11 2003/12/11 16:03:30 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.11 2003/12/11 16:03:30 paulo Exp $ ;; (provide "xedit") @@ -77,6 +78,8 @@ "RPM spec" "rpm" . *rpm-mode*) ("\\<XFree86\\.\\d+\\.log$" "XFree86 log" "xlog" . *xlog-mode*) + ("\\.(diff|patch)" + "Patch file" "patch" . *patch-mode*) )) diff --git a/lisp/private.h b/lisp/private.h index 6b78d02..fdceb21 100644 --- a/lisp/private.h +++ b/lisp/private.h @@ -27,15 +27,23 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */ +/* $XdotOrg: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */ #ifndef Lisp_private_h #define Lisp_private_h +#include <X11/Xos.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#if defined(X_POSIX_C_SOURCE) +#define _POSIX_C_SOURCE X_POSIX_C_SOURCE #include <setjmp.h> +#undef _POSIX_C_SOURCE +#else +#include <setjmp.h> +#endif #include <unistd.h> #include <sys/time.h> #include "lisp/internal.h" |