Merge from origin/emacs-24

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

diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 6c88d694b7fc62403406daf2e6e79aadfb5f48c5..cde41248bee37c0fe14b0858b7ec6c7b400e2b10 100644 (file)
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -1,9 +1,9 @@
 ;;; rng-util.el --- utility functions for RELAX NG library
 
-;; Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: XML, RelaxNG
+;; Keywords: wp, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
@@ -37,8 +37,7 @@
 (defconst rng-builtin-datatypes-uri (rng-make-datatypes-uri ""))
 
 (defun rng-uniquify-eq (list)
-  "Destructively remove any element from LIST that is eq to
-its predecessor."
+  "Destructively remove `eq' duplicates from LIST."
   (and list
        (let ((head list))
         (while (cdr head)
@@ -48,8 +47,7 @@ its predecessor."
         list)))
 
 (defun rng-uniquify-equal (list)
-  "Destructively remove any element from LIST that is equal to
-its predecessor."
+  "Destructively remove `equal' duplicates from LIST."
   (and list
        (let ((head list))
         (while (cdr head)
@@ -61,7 +59,7 @@ its predecessor."
 (defun rng-blank-p (str) (string-match "\\`[ \t\n\r]*\\'" str))
 
 (defun rng-substq (new old list)
-  "Replace first member of LIST (if any) that is eq to OLD by NEW.
+  "Replace first member of LIST (if any) that is `eq' to OLD by NEW.
 LIST is not modified."
   (cond ((null list) nil)
        ((eq (car list) old)
@@ -90,7 +88,7 @@ Replaces the text between START and point with a string chosen using a
 completion table and, when needed, input read from the user with the
 minibuffer.
 Returns the new string if either a complete and unique completion was
-determined automatically or input was read from the user. Otherwise,
+determined automatically or input was read from the user.  Otherwise,
 returns nil.
 TABLE is an alist, a symbol bound to a function or an obarray as with
 the function `completing-read'.
@@ -167,7 +165,8 @@ HIST, if non-nil, specifies a history list as with `completing-read'."
     (setq string (substring string 0 -1)))
   string)
 
+(define-error 'rng-error nil)
+
 (provide 'rng-util)
 
-;; arch-tag: 2dc233e0-5e7a-488f-bfc4-5909512dbaf0
 ;;; rng-util.el ends here