from trunk

[bpt/emacs.git] / lisp / nxml / rng-maint.el

diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index fa72dcf..e3da031 100644 (file)
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -1,16 +1,16 @@
 ;;; rng-maint.el --- commands for RELAX NG maintainers
 
-;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,64 +30,6 @@
 
 (defvar rng-dir (file-name-directory load-file-name))
 
-(defconst rng-autoload-modules
-  '(xmltok
-    nxml-mode
-    nxml-uchnm
-    nxml-glyph
-    rng-cmpct
-    rng-maint
-    rng-valid
-    rng-xsd
-    rng-nxml))
-
-(defun rng-update-autoloads ()
-  "Update the autoloads in rng-auto.el."
-  (interactive)
-  (let* ((generated-autoload-file (expand-file-name "rng-auto.el"
-                                                   rng-dir)))
-    (mapcar (lambda (x)
-             (update-file-autoloads
-              (expand-file-name (concat (symbol-name x) ".el") rng-dir)))
-           rng-autoload-modules)))
-
-
-(defconst rng-compile-modules
-  '(xmltok
-    nxml-util
-    nxml-enc
-    nxml-glyph
-    nxml-rap
-    nxml-outln
-    nxml-mode
-    nxml-uchnm
-    nxml-ns
-    nxml-parse
-    nxml-maint
-    xsd-regexp
-    rng-util
-    rng-dt
-    rng-xsd
-    rng-uri
-    rng-pttrn
-    rng-cmpct
-    rng-match
-    rng-parse
-    rng-loc
-    rng-valid
-    rng-nxml
-    rng-maint))
-
-(defun rng-byte-compile-load ()
-  "Byte-compile and load all of the RELAX NG library in an appropriate order."
-  (interactive)
-  (mapcar (lambda (x)
-           (byte-compile-file (expand-file-name (concat (symbol-name x) ".el")
-                                                rng-dir)
-                              t))
-         rng-compile-modules))
-
-
 ;;; Conversion from XML to texinfo.
 ;; This is all a hack and is just enough to make the conversion work.
 ;; It's not intended for public use.
@@ -106,8 +46,7 @@
                                                       rng-dir)))
        (texi-buf (find-file-noselect (expand-file-name rng-manual-texi
                                                        rng-dir))))
-    (save-excursion
-      (set-buffer texi-buf)
+    (with-current-buffer texi-buf
       (erase-buffer)
       (let ((standard-output texi-buf))
        (princ (format "\\input texinfo @c -*- texinfo -*-\n\
@@ -272,27 +211,17 @@
             ))))
 
 (defun rng-manual-output-force-new-line ()
-  (save-excursion
-    (set-buffer standard-output)
+  (with-current-buffer standard-output
     (unless (eq (char-before) ?\n)
       (insert ?\n))))
 
 (defun rng-manual-output-force-blank-line ()
-  (save-excursion
-    (set-buffer standard-output)
+  (with-current-buffer standard-output
     (if (eq (char-before) ?\n)
        (unless (eq (char-before (1- (point))) ?\n)
          (insert ?\n))
       (insert "\n\n"))))
 
-;;; Versioning
-
-(defun rng-write-version ()
-  (find-file "VERSION")
-  (erase-buffer)
-  (insert nxml-version "\n")
-  (save-buffer))
-
 ;;; Timing
 
 (defun rng-time-to-float (time)