- Remove obsolete xemacs support. - Bump version number to 1.4.0 to avoid possible misunderstandings. Major Linux distributions have adopted an unofficial version labeled as 1.4.0 which includes fixes for Emacs 24.x while the official distfile is still 1.3.2. There is no substantial difference between 1.3.2 and 1.4.0 except for Emacs 24.x compatibility, and this FreeBSD port has already had almost the same changes. Although similar unofficial versions can be found at [1] or [2], they look inconsistent and/or not actively maintained. The official distfile is used for this reason. [1] http://www.fsavigny.de/gpled-software/psgml-1.4.0.tar.gz [2] https://marmalade-repo.org/packages/psgml
61 lines
2.1 KiB
EmacsLisp
61 lines
2.1 KiB
EmacsLisp
--- psgml-dtd.el.orig 2005-03-05 16:23:40 UTC
|
|
+++ psgml-dtd.el
|
|
@@ -93,12 +93,12 @@
|
|
(defmacro sgml-for-all-final-states (s dfa &rest forms)
|
|
"For all final states S in DFA do FORMS.
|
|
Syntax: var dfa-expr &body forms"
|
|
- (` (let ((L-states (sgml-some-states-of (, dfa)))
|
|
- (, s))
|
|
+ `(let ((L-states (sgml-some-states-of ,dfa))
|
|
+ ,s)
|
|
(while L-states
|
|
- (when (sgml-state-final-p (setq (, s) (car L-states)))
|
|
- (,@ forms))
|
|
- (setq L-states (cdr L-states))))))
|
|
+ (when (sgml-state-final-p (setq ,s (car L-states)))
|
|
+ ,@forms)
|
|
+ (setq L-states (cdr L-states)))))
|
|
|
|
(put 'sgml-for-all-final-states 'lisp-indent-hook 2)
|
|
(put 'sgml-for-all-final-states 'edebug-form-hook '(symbolp &rest form))
|
|
@@ -217,7 +217,7 @@ Syntax: var dfa-expr &body forms"
|
|
(defun sgml-make-pcdata ()
|
|
(sgml-make-* (sgml-make-primitive-content-token sgml-pcdata-token)))
|
|
|
|
-(defun sgml-reduce-, (l)
|
|
+(defun sgml-reduce-\, (l)
|
|
(while (cdr l)
|
|
(setcar (cdr l)
|
|
(sgml-make-conc (car l) (cadr l)))
|
|
@@ -279,7 +279,7 @@ Syntax: var dfa-expr &body forms"
|
|
(sgml-parse-delim "CRO" (digit nmstart))
|
|
(sgml-parse-delim "CRO" (digit)))
|
|
(prog1 (if (sgml-is-delim "NULL" digit)
|
|
- (string-to-int (sgml-check-nametoken))
|
|
+ (string-to-number (sgml-check-nametoken))
|
|
(let ((spec (sgml-check-name)))
|
|
(or (cdr (assoc spec '(("RE" . 10)
|
|
("RS" . 1)
|
|
@@ -336,7 +336,7 @@ Syntax: var dfa-expr &body forms"
|
|
(defsubst sgml-parse-connector ()
|
|
(sgml-skip-ps)
|
|
(cond ((sgml-parse-delim "SEQ")
|
|
- (function sgml-reduce-,))
|
|
+ (function sgml-reduce-\,))
|
|
((sgml-parse-delim "OR")
|
|
(function sgml-reduce-|))
|
|
((sgml-parse-delim "AND")
|
|
@@ -884,10 +884,10 @@ Syntax: (var seq) &body forms
|
|
FORMS should produce the binary coding of element in VAR."
|
|
(let ((var (car loop-c))
|
|
(seq (cadr loop-c)))
|
|
- (` (let ((seq (, seq)))
|
|
+ `(let ((seq ,seq))
|
|
(sgml-code-number (length seq))
|
|
- (loop for (, var) in seq
|
|
- do (,@ body))))))
|
|
+ (loop for ,var in seq
|
|
+ do ,@body))))
|
|
|
|
(put 'sgml-code-sequence 'lisp-indent-hook 1)
|
|
(put 'sgml-code-sequence 'edbug-forms-hook '(sexp &rest form))
|