aboutsummaryrefslogtreecommitdiffstats
path: root/src/xml.c
diff options
context:
space:
mode:
authorJoakim Verona2011-07-25 10:54:22 +0200
committerJoakim Verona2011-07-25 10:54:22 +0200
commit37d6e227b2e4460b36363e42a3de45c082233c74 (patch)
tree99ce5c28b62bd068319ab2c24a97adf764c9a2e2 /src/xml.c
parentb60646c64ead035bff3e5ba925f768f36964f661 (diff)
parent0f0a88b94cce778a7903196b07a0d70657fb4dc0 (diff)
downloademacs-37d6e227b2e4460b36363e42a3de45c082233c74.tar.gz
emacs-37d6e227b2e4460b36363e42a3de45c082233c74.zip
upstream merge. cleanup
Diffstat (limited to 'src/xml.c')
-rw-r--r--src/xml.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xml.c b/src/xml.c
index a8a4d8122da..55352baae3a 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -87,7 +87,6 @@ static Lisp_Object
87parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int htmlp) 87parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int htmlp)
88{ 88{
89 xmlDoc *doc; 89 xmlDoc *doc;
90 xmlNode *node;
91 Lisp_Object result = Qnil; 90 Lisp_Object result = Qnil;
92 const char *burl = ""; 91 const char *burl = "";
93 EMACS_INT bytes; 92 EMACS_INT bytes;
@@ -129,13 +128,13 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html
129 Lisp_Object r = Qnil; 128 Lisp_Object r = Qnil;
130 129
131 while (n) { 130 while (n) {
132 if (r != Qnil) 131 if (!NILP (r))
133 result = Fcons (r, result); 132 result = Fcons (r, result);
134 r = make_dom (n); 133 r = make_dom (n);
135 n = n->next; 134 n = n->next;
136 } 135 }
137 136
138 if (result == Qnil) 137 if (NILP (result))
139 result = r; 138 result = r;
140 else 139 else
141 result = Fcons (intern ("top"), 140 result = Fcons (intern ("top"),