martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(xml-get-attribute-or-nil): New function, like

Browse Source 
xml-get-attribute, but returns nil if the attribute was not found.
(xml-get-attribute): Converted to defsubst, uses
xml-get-attribute-or-nil.
This commit is contained in:
Eli Zaretskii
2003-12-29 12:13:27 +00:00
parent dffafab086
commit 9bcd6a7e94
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-12-29 Mark A. Hershberger <mah@everybody.org>
* xml.el (xml-get-attribute-or-nil): New function, like
xml-get-attribute, but returns nil if the attribute was not found.
(xml-get-attribute): Converted to defsubst, uses
xml-get-attribute-or-nil.
2003-12-29 Eli Zaretskii <eliz@elta.co.il>
* emacs-lisp/easymenu.el (easy-menu-define): Doc fix.

17
lisp/xml.el
View File

@@ -104,15 +104,24 @@ 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."
nil is returned if the attribute was not found.
See also `xml-get-attribute'."
(if (xml-node-attributes node)
(let ((value (assoc attribute (xml-node-attributes node))))
(if value
(cdr value)
""))
""))
nil))
nil))
(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) ""))
;;*******************************************************************
;;**