File flavour.patch of Package psgml
--- psgml-maint.el
+++ psgml-maint.el 2012-07-02 12:28:34.284377856 +0000
@@ -78,7 +78,7 @@
(defun psgml-compile-files ()
"Compile the PSGML source files that needs compilation."
(interactive)
- (psgml-find-source-dir (interactive-p))
+ (psgml-find-source-dir (called-interactively-p))
(let ((default-directory psgml-source-dir)
(load-path (cons psgml-source-dir load-path)))
(mapcar (function psgml-byte-compile-file)
--- psgml-parse.el
+++ psgml-parse.el 2012-07-02 13:03:42.892010400 +0000
@@ -440,7 +440,7 @@ Applicable to XML.")
;; set of moves: list of moves
(defmacro sgml-add-move-to-set (token node set)
- (`(cons (cons (, token) (, node)) (, set))))
+ `(cons (cons ,token ,node) , set))
(defmacro sgml-moves-lookup (token set)
(` (assq (, token) (, set))))
@@ -460,7 +460,7 @@ Applicable to XML.")
(` (cddr (, s))))
(defmacro sgml-state-final-p (s)
- (`(null (sgml-state-reqs (, s)))))
+ `(null (sgml-state-reqs ,s)))
;; adding moves
;; *** Should these functions check for ambiguity?
@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned."
(cons
'progn
(loop for n in names collect
- (`(defmacro (, (intern (format "sgml-eltype-%s" n))) (et)
- (list 'get et ''(, n)))))))
+ `(defmacro ,(intern (format "sgml-eltype-%s" n)) (et)
+ (list 'get et '',n)))))
(sgml-prop-fields
;;flags ; optional tags and mixed
--- xxml.el
+++ xxml.el 2012-07-02 12:28:42.168509922 +0000
@@ -293,7 +293,7 @@ Use nil to silence all progress.")
(defun xxml-version ()
"Identifies the current version of this module."
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p)
(message xxml-version)
xxml-version))
--- xxml/xxml.el
+++ xxml/xxml.el 2012-07-02 12:28:38.396510520 +0000
@@ -293,7 +293,7 @@ Use nil to silence all progress.")
(defun xxml-version ()
"Identifies the current version of this module."
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p)
(message xxml-version)
xxml-version))
