Commit 9499da38 authored by Glenn Morris's avatar Glenn Morris
Browse files

Add 2007 to copyright years.

Switch license to standard GPLv3+ text.
(xmltok-scan-char-ref, xmltok-char-number): Use string-to-number
rather than string-to-int.
parent 09aa73e6
;;; xmltok.el --- XML tokenization ;;; xmltok.el --- XML tokenization
;; Copyright (C) 2003 Free Software Foundation, Inc. ;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
;; Author: James Clark ;; Author: James Clark
;; Keywords: XML ;; Keywords: XML
;; This program is free software; you can redistribute it and/or ;; This file is part of GNU Emacs.
;; 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 ;; GNU Emacs is free software; you can redistribute it and/or modify
;; useful, but WITHOUT ANY WARRANTY; without even the implied ;; it under the terms of the GNU General Public License as published by
;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; the Free Software Foundation; either version 3, or (at your option)
;; PURPOSE. See the GNU General Public License for more details. ;; any later version.
;; You should have received a copy of the GNU General Public ;; GNU Emacs is distributed in the hope that it will be useful,
;; License along with this program; if not, write to the Free ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; MA 02111-1307 USA ;; 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: ;;; Commentary:
...@@ -1033,7 +1035,7 @@ as special. Return the type of the token." ...@@ -1033,7 +1035,7 @@ as special. Return the type of the token."
(defun xmltok-scan-char-ref (start end base) (defun xmltok-scan-char-ref (start end base)
(setq xmltok-replacement (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))) base)))
(cond ((and (integerp n) (xmltok-valid-char-p n)) (cond ((and (integerp n) (xmltok-valid-char-p n))
(setq n (xmltok-unicode-to-char n)) (setq n (xmltok-unicode-to-char n))
...@@ -1047,7 +1049,7 @@ as special. Return the type of the token." ...@@ -1047,7 +1049,7 @@ as special. Return the type of the token."
(let* ((base (if (eq (char-after (+ start 2)) ?x) (let* ((base (if (eq (char-after (+ start 2)) ?x)
16 16
10)) 10))
(n (string-to-int (n (string-to-number
(buffer-substring-no-properties (+ start (if (= base 16) 3 2)) (buffer-substring-no-properties (+ start (if (= base 16) 3 2))
(1- end)) (1- end))
base))) base)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment