1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
--- psgml.el.orig 2015-11-12 06:36:57 UTC
+++ psgml.el
@@ -52,7 +52,7 @@
;;; Code:
-(defconst psgml-version "1.3.2"
+(defconst psgml-version "1.4.0"
"Version of psgml package.")
(defconst psgml-maintainer-address "lenst@lysator.liu.se")
@@ -381,7 +381,7 @@ Setting this variable automatically make
(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" ))
+ '("%S" "@prefix@/share/sgml/%o/%c/%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
@@ -407,13 +407,15 @@ This variable is automatically local to
(defvar sgml-catalog-files (or (delete nil
(sgml-parse-colon-path
(getenv "SGML_CATALOG_FILES")))
- '("catalog" "/usr/local/lib/sgml/catalog"))
+ '("catalog" "@prefix@/share/sgml/catalog"
+ "@prefix@/share/xml/catalog"))
"*List of catalog entry files.
The files are in the format defined in the SGML Open Draft Technical
Resolution on Entity Management.")
(put 'sgml-catalog-files 'sgml-type 'file-list)
-(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "/usr/local/lib/sgml/ECAT")
+(defvar sgml-ecat-files '("ECAT" "~/sgml/ECAT" "@prefix@/share/sgml/ECAT"
+ "@prefix@/share/xml/ECAT")
"*List of catalog files for PSGML.")
(put 'sgml-ecat-files 'sgml-type 'file-list)
@@ -722,9 +724,9 @@ as that may change."
(defun sgml-markup (entry text)
(cons entry
- (` (lambda ()
+ `(lambda ()
(interactive)
- (sgml-insert-markup (, text))))))
+ (sgml-insert-markup ,text))))
(defun sgml-insert-markup (text)
(let ((end (sgml-mouse-region))
@@ -1040,13 +1042,13 @@ as that may change."
(defun sgml-compute-insert-dtd-items ()
(loop for e in sgml-custom-dtd collect
(vector (first e)
- (` (sgml-doctype-insert (, (cadr e)) '(, (cddr e))))
+ `(sgml-doctype-insert ,(cadr e) ',(cddr e))
t)))
(defun sgml-compute-custom-markup-items ()
(loop for e in sgml-custom-markup collect
(vector (first e)
- (` (sgml-insert-markup (, (cadr e))))
+ `(sgml-insert-markup ,(cadr e))
t)))
(defun sgml-build-custom-menus ()
@@ -1229,12 +1231,14 @@ All bindings:
(make-local-variable 'text-property-default-nonsticky)
;; see `sgml-set-face-for':
(add-to-list 'text-property-default-nonsticky '(face . t)))
- (make-local-hook 'post-command-hook)
+ (if (fboundp 'make-local-hook)
+ (eval '(make-local-hook 'post-command-hook)))
(add-hook 'post-command-hook 'sgml-command-post 'append 'local)
(unless sgml-running-lucid
;; XEmacs 20.4 doesn't handle local activate-menubar-hook
;; it tries to call the function `t' when using the menubar
- (make-local-hook 'activate-menubar-hook))
+ (if (fboundp 'make-local-hook)
+ (eval '(make-local-hook 'activate-menubar-hook))))
(add-hook 'activate-menubar-hook 'sgml-update-all-options-menus
nil 'local)
(run-hooks 'text-mode-hook 'psgml-mode-hook)
|
