Lennart> As usually the XEmacs maintainers have confused things by Lennart> not making it clear what is XEmacs specific. There is no Lennart> code like the above in the standard PSGML dist. Here is a more complete diff made against the distribution downloaded from http://www.lysator.liu.se/~lenst/about_psgml/psgml-1.2.1.tar.gz Unfortunatley, the FTP server appears to be down, so I couldn't diff against 1.2.0. I've tried to edit any differences between 1.2.1 and 1.2.0 out of the following. Note that the standard distrution has psgml-version set to 1.2.0, even though it was downloaded from 1.2.1, and also that the xemacs version has psgml-version set to 1.2.1, even though it supposedly based on 1.2.0. This could be quite confusing. I've also omitted the defvar/defcustom split, the lucid-p/xemacs-p split, and most anything else not related to eliminating platform dependencies in pathnames and filenames. -- Paul diff -u b:\Pkrause\.xemacs\psgml-1.2.1\psgml.el c:\Program Files\Xemacs\xemacs-packages\lisp\psgml\psgml.el --- b:\Pkrause\.xemacs\psgml-1.2.1\psgml.el Fri Aug 25 11:04:12 2000 +++ c:\Program Files\Xemacs\xemacs-packages\lisp\psgml\psgml.el Fri Aug 25 11:04:12 2000 ＠＠ -1,5 +1,5 ＠＠ ;;; psgml.el --- SGML-editing mode with parsing support -;; $Id: psgml.el,v 2.48 1999/10/10 13:48:38 lenst Exp $ +;; $Id: psgml.el,v 1.9 2000/07/05 05:31:50 yoshiki Exp $ ;; Copyright (C) 1993-1999 Lennart Staflin ;; Copyright (C) 1992 Free Software Foundation, Inc. ＠＠ -52,7 +52,7 ＠＠ ;;; Code: -(defconst psgml-version "1.2.0" +(defconst psgml-version "1.2.1" "Version of psgml package.") (defconst psgml-maintainer-address "lenst(a)lysator.liu.se") ＠＠ -308,7 +374,25 ＠＠ Setting this variable automatically makes it local to the current buffer.") (make-variable-buffer-local 'sgml-indent-data) +;;; Wing addition +(defcustom sgml-inhibit-indent-tags nil + "*List of tags within which indentation is inhibited. +The tags should be given as strings." + :type 'boolean + :group 'psgml) + +;;; James addition +(defvar sgml-menu-name "SGML" + "*The name of the menu on which the SGML mode options appear. +This is intended to be overridden by submodes of sgml-mode.") + +;;; XEmacs change +(defvar sgml-data-directory (or (locate-data-directory "psgml") + (locate-data-directory "sgml")) + "*Directory for pre-supplied data files (DTD's and such). +Set this before loading psgml.") +;; This isn't used now (defun sgml-parse-colon-path (cd-path) "Explode a colon-separated list of paths into a string list." (if (null cd-path) ＠＠ -328,14 +412,22 ＠＠ (setq cd-start (+ cd-colon 1))) cd-list))) -(defvar sgml-system-path (sgml-parse-colon-path - (or (getenv "SGML_SEARCH_PATH") - ".")) - "*List of directories used to look for system identifiers.") +(defcustom sgml-system-path (split-path (or (getenv "SGML_SEARCH_PATH") ".")) + ;; wing addition + "*List of directories used to look for system identifiers. +The directory listed in `sgml-data-directory' is always searched in +addition to the directories listed here." + :type '(repeat directory) + :group 'psgml) (put 'sgml-system-path 'sgml-type 'file-list) -(defvar sgml-public-map (or (sgml-parse-colon-path (getenv "SGML_PATH")) - '("%S" "/usr/local/lib/sgml/%o/%c/%d" )) +(defcustom sgml-public-map (split-path (or (getenv "SGML_PATH") + ;; Wing/Krause change + (concat "%S" path-separator + (directory-file-name + sgml-data-directory) + "%o" (string directory-sep-char) + "%c" (string directory-sep-char) "%d"))) "*Mapping from public identifiers to file names. This is a list of possible file names. To find the file for a public identifier the elements of the list are used one at the time from the ＠＠ -348,41 +440,60 ＠＠ used for the public identifier. An element can also be a dotted pair (regexp . filename), the filename is a string treated as above, but only if the regular expression, regexp, matches the public -identifier.") +identifier." + :type '(repeat file) + :group 'psgml-dtd) (put 'sgml-public-map 'sgml-type 'list) -(defvar sgml-local-catalogs nil +(defcustom sgml-local-catalogs nil "*A list of SGML entity catalogs to be searched first when parsing the buffer. This is used in addtion to `sgml-catalog-files', and `sgml-public-map'. -This variable is automatically local to the buffer.") +This variable is automatically local to the buffer." + :type '(repeat file) + :group 'psgml-dtd) (make-variable-buffer-local 'sgml-local-catalogs) (put 'sgml-local-catalogs 'sgml-type 'file-list) -(defvar sgml-catalog-files (or (delete nil - (sgml-parse-colon-path - (getenv "SGML_CATALOG_FILES"))) - '("catalog" "/usr/local/lib/sgml/catalog")) +(defcustom sgml-catalog-files (split-path + (or (getenv "SGML_CATALOG_FILES") + ;; Wing/Krause addition + (concat "CATALOG" path-separator + (expand-file-name + "CATALOG" + sgml-data-directory)))) "*List of catalog entry files. The files are in the format defined in the SGML Open Draft Technical -Resolution on Entity Management.") +Resolution on Entity Management." + :type '(repeat file) + :group 'psgml-dtd) (put 'sgml-catalog-files 'sgml-type 'file-list)