Update copyright year to 2016

[gnu-emacs] / lisp / nxml / rng-uri.el

diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index 8c0d409d52055db10f5beccfae19d64e4b6611c7..75cf23f888db6dd37a4bf1ab3fdb4020c1d62de8 100644 (file)
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -1,9 +1,9 @@
 ;;; rng-uri.el --- URI parsing and manipulation
 
-;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: XML
+;; Keywords: wp, hypermedia, languages, XML
 
 ;; This file is part of GNU Emacs.
 
@@ -85,7 +85,7 @@ Signal an error if URI is not a valid file URL."
          ((not (string= (downcase scheme) "file"))
           (rng-uri-error "URI `%s' does not use the `file:' scheme" uri)))
     (when (not (member authority
-                      (cons system-name '(nil "" "localhost"))))
+                      (cons (system-name) '(nil "" "localhost"))))
       (rng-uri-error "URI `%s' does not start with `file:///' or `file://localhost/'"
             uri))
     (when query
@@ -125,7 +125,7 @@ Signal an error if URI is not a valid file URL."
          (t path))))
 
 (defun rng-uri-error (&rest args)
-  (signal 'rng-uri-error (list (apply 'format args))))
+  (signal 'rng-uri-error (list (apply #'format-message args))))
 
 (define-error 'rng-uri-error "Invalid URI")