(webjump-builtin): Add missing format string

[gnu-emacs] / lisp / xml.el

diff --git a/lisp/xml.el b/lisp/xml.el
index 279fe48b16ba0233a6d71ee9e7c9a029ab687c04..dbd991f5583945caa2ae14d0d38456404ae97504 100644 (file)
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -104,15 +104,22 @@ CHILD-NAME should be a lower case symbol."
              (push child match))))
     (nreverse match)))
 
-(defun xml-get-attribute (node attribute)
+(defun xml-get-attribute-or-nil (node attribute)
   "Get from NODE the value of ATTRIBUTE.
-An empty string is returned if the attribute was not found."
-  (if (xml-node-attributes node)
-      (let ((value (assoc attribute (xml-node-attributes node))))
-       (if value
-           (cdr value)
-         ""))
-    ""))
+Return `nil' if the attribute was not found.
+
+See also `xml-get-attribute'."
+  (when (xml-node-attributes node)
+    (let ((value (assoc attribute (xml-node-attributes node))))
+      (when value
+       (cdr value)))))
+
+(defsubst xml-get-attribute (node attribute)
+  "Get from NODE the value of ATTRIBUTE.
+An empty string is returned if the attribute was not found.
+
+See also `xml-get-attribute-or-nil'."
+  (or (xml-get-attribute-or-nil node attribute) ""))
 
 ;;*******************************************************************
 ;;**
@@ -286,7 +293,6 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
    attr-list)
   attr-list)
 
-
 (defun xml-intern-attrlist (attr-list)
   "Convert attribute names to symbols for backward compatibility."
   (mapcar (lambda (attr)
@@ -349,12 +355,12 @@ Returns one of:
       (let* ((node-name (match-string 1))
             (attr-list (xml-parse-attlist))
             (children (if  (consp xml-ns) ;; take care of namespace parsing
-                           (progn 
+                           (progn
                              (setq xml-ns (xml-ns-parse-ns-attrs
                                            attr-list xml-ns))
-                             (list (xml-ns-expand-attr 
+                             (list (xml-ns-expand-attr
                                     attr-list xml-ns)
-                                   (xml-ns-expand-el 
+                                   (xml-ns-expand-el
                                     node-name xml-ns)))
                            (list (xml-intern-attrlist attr-list)
                                  (intern node-name))))
@@ -546,7 +552,7 @@ This follows the rule [28] in the XML specifications."
            ;;  rule [45]: the element declaration must be unique
            (if (assoc element dtd)
                (error "XML: element declarations must be unique in a DTD (<%s>)"
-                      element)
+                      element))
 
            ;;  Store the element in the DTD
            (push (list element type) dtd)
@@ -559,7 +565,7 @@ This follows the rule [28] in the XML specifications."
 
          ;;  Skip the end of the DTD
          (search-forward ">"))))
-    (nreverse dtd))))
+    (nreverse dtd)))
 
 (defun xml-parse-elem-type (string)
   "Convert element type STRING into a Lisp structure."