8402b7a610
- 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
49 lines
1.9 KiB
EmacsLisp
49 lines
1.9 KiB
EmacsLisp
--- psgml-edit.el.orig 2015-11-12 06:36:57 UTC
|
|
+++ psgml-edit.el
|
|
@@ -185,7 +185,9 @@ possible."
|
|
(goto-char (sgml-element-start element))
|
|
(delete-char (sgml-element-stag-len element))
|
|
(insert (sgml-delim "STAGO")
|
|
- (sgml-general-insert-case gi)
|
|
+ (if (symbolp gi)
|
|
+ (sgml-general-insert-case (symbol-name gi))
|
|
+ (sgml-general-insert-case gi))
|
|
tagc)
|
|
(let* ((newel (sgml-find-context-of (point)))
|
|
(newattlist (sgml-element-attlist newel))
|
|
@@ -1870,24 +1872,28 @@ characters in the current coding system.
|
|
(invert
|
|
(or (looking-at "&#\\([0-9]+\\)[;\n]?")
|
|
(error "No character reference after point"))
|
|
- (let ((c (string-to-int (buffer-substring (match-beginning 1)
|
|
+ (let ((c (string-to-number (buffer-substring (match-beginning 1)
|
|
(match-end 1)))))
|
|
(delete-region (match-beginning 0)
|
|
(match-end 0))
|
|
(if (fboundp 'decode-char) ; Emacs 21, Mule-UCS
|
|
(setq c (decode-char 'ucs c))
|
|
+ (if (fboundp 'ucs-to-char)
|
|
+ (setq c (ucs-to-char c))
|
|
;; Else have to assume 8-bit character.
|
|
- (if (fboundp 'unibyte-char-to-multibyte) ; Emacs 20
|
|
- (setq c (unibyte-char-to-multibyte c))))
|
|
+ (if (fboundp 'unibyte-char-to-multibyte) ; Emacs 20
|
|
+ (setq c (unibyte-char-to-multibyte c)))))
|
|
(insert c)))
|
|
;; Convert character to &#nn;
|
|
(t
|
|
(let ((c (following-char)))
|
|
(delete-char 1)
|
|
- (if (fboundp 'encode-char)
|
|
- (setq c (encode-char c 'ucs))
|
|
- (if (fboundp 'multibyte-char-to-unibyte)
|
|
- (setq c (multibyte-char-to-unibyte c))))
|
|
+ (if (fboundp 'char-to-ucs)
|
|
+ (setq c (char-to-ucs c))
|
|
+ (if (fboundp 'encode-char)
|
|
+ (setq c (encode-char c 'ucs))
|
|
+ (if (fboundp 'multibyte-char-to-unibyte)
|
|
+ (setq c (multibyte-char-to-unibyte c)))))
|
|
(insert (format "&#%d;" c))))))
|
|
|
|
(defun sgml-expand-entity-reference ()
|