Merge from emacs--devo--0

[gnu-emacs] / lisp / progmodes / ebnf-ebx.el

diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 45ccb956af8799048d50a0261cf886684e4e990b..0f8976ab7ecfe38959a681238d6a8ce47a76ce93 100644 (file)
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -1,12 +1,12 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
 
-;; Copyright (C) 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/04/03 16:45:34 vinicius>
 ;; Keywords: wp, ebnf, PostScript
-;; Version: 1.1
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -295,7 +295,7 @@
          (cons (car except)
                (ebnf-make-except (cdr term) (cdr except))))
       term)))
-         
+
 
 
 ;;; term ::= factor ('*' | '+' | '?')?
@@ -416,7 +416,7 @@
 
 
 (defun ebnf-ebx-lex ()
-  "Lexical analyser for EBNFX.
+  "Lexical analyzer for EBNFX.
 
 Return a lexical token.
 
@@ -503,7 +503,7 @@ See documentation for variable `ebnf-ebx-lex'."
       (error "Missing end of constraint `]'"))
   (forward-char)
   t)
-  
+
 
 
 (defun ebnf-ebx-skip-end-of-rule ()
@@ -539,6 +539,12 @@ See documentation for variable `ebnf-ebx-lex'."
    ;; close EPS file
    ((and ebnf-eps-executing (= (following-char) ?\]))
     (ebnf-eps-remove-context (ebnf-ebx-eps-filename)))
+   ;; EPS header
+   ((and ebnf-eps-executing (= (following-char) ?H))
+    (ebnf-eps-header-comment (ebnf-ebx-eps-filename)))
+   ;; EPS footer
+   ((and ebnf-eps-executing (= (following-char) ?F))
+    (ebnf-eps-footer-comment (ebnf-ebx-eps-filename)))
    ;; any other action in comment
    (t
     (setq ebnf-action (aref ebnf-comment-table (following-char))))