42 lines
1.5 KiB
EmacsLisp
42 lines
1.5 KiB
EmacsLisp
$NetBSD: patch-psgml-edit.el,v 1.1 2012/08/16 11:54:56 wiz Exp $
|
|
|
|
Fix build with emacs24. From FreeBSD ports.
|
|
|
|
--- psgml-edit.el.orig 2005-03-05 16:23:40.000000000 +0000
|
|
+++ psgml-edit.el
|
|
@@ -1870,24 +1870,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 ()
|