Index: clang/tools/clang-format/clang-format.el
===================================================================
--- clang/tools/clang-format/clang-format.el
+++ clang/tools/clang-format/clang-format.el
@@ -82,29 +82,29 @@
         (let* ((children (xml-node-children node))
                (text (car children)))
           (cl-case (xml-node-name node)
-            ('replacement
+            ((replacement quote)
              (let* ((offset (xml-get-attribute-or-nil node 'offset))
                     (length (xml-get-attribute-or-nil node 'length)))
                (when (or (null offset) (null length))
                  (error "<replacement> node does not have offset and length attributes"))
                (when (cdr children)
                  (error "More than one child node in <replacement> node"))

                (setq offset (string-to-number offset))
                (setq length (string-to-number length))
                (push (list offset length text) replacements)))
-            ('cursor
+            ((cursor quote)
              (setq cursor (string-to-number text)))))))

     ;; Sort by decreasing offset, length.
     (setq replacements (sort (delq nil replacements)
                              (lambda (a b)
                                (or (> (car a) (car b))
                                    (and (= (car a) (car b))
                                         (> (cadr a) (cadr b)))))))

     (list replacements cursor (string= incomplete-format "true"))))

 (defun clang-format--replace (offset length &optional text)
   "Replace the region defined by OFFSET and LENGTH with TEXT.
 OFFSET and LENGTH are measured in bytes, not characters.  OFFSET