[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/nxml/xmltok.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/nxml/xmltok.el,v |
Date: |
Wed, 28 Nov 2007 04:14:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/11/28 04:14:53
Index: xmltok.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/xmltok.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- xmltok.el 23 Nov 2007 22:49:35 -0000 1.2
+++ xmltok.el 28 Nov 2007 04:14:52 -0000 1.3
@@ -1,24 +1,26 @@
;;; xmltok.el --- XML tokenization
-;; Copyright (C) 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: XML
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2 of
-;; the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be
-;; useful, but WITHOUT ANY WARRANTY; without even the implied
-;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;; PURPOSE. See the GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public
-;; License along with this program; if not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-;; MA 02111-1307 USA
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
@@ -1033,7 +1035,7 @@
(defun xmltok-scan-char-ref (start end base)
(setq xmltok-replacement
- (let ((n (string-to-int (buffer-substring-no-properties start end)
+ (let ((n (string-to-number (buffer-substring-no-properties start end)
base)))
(cond ((and (integerp n) (xmltok-valid-char-p n))
(setq n (xmltok-unicode-to-char n))
@@ -1047,7 +1049,7 @@
(let* ((base (if (eq (char-after (+ start 2)) ?x)
16
10))
- (n (string-to-int
+ (n (string-to-number
(buffer-substring-no-properties (+ start (if (= base 16) 3 2))
(1- end))
base)))