* lisp/progmodes/flymake.el (flymake-xml-program): New option.

(flymake-xml-init): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29231c7d8ec767c8ed93a180acb495c5759d765b..75002528d2113f9bec7cee0516c169f694bd8612 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-05-14  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/flymake.el (flymake-xml-program): New option.
+       (flymake-xml-init): Use it.
+
        * term/xterm.el: Provide a feature.
 
        * term/sup-mouse.el: Move to obsolete/.  Provide a feature.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0eb59bd06c3b9a54d8d51ca1b4285e5108d9c760..79bccd138ee31409606e094042baaabb31a52cc5 100644 (file)
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -257,6 +257,13 @@ are the string substitutions (see `format')."
   :version "23.1"
   :group 'tools)
 
+(defcustom flymake-xml-program
+  (if (executable-find "xmlstarlet") "xmlstarlet" "xml")
+  "Program to use for XML validation."
+  :type 'file
+  :group 'flymake
+  :version "24.4")
+
 (defcustom flymake-allowed-file-name-masks
   '(("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-simple-make-init)
     ("\\.xml\\'" flymake-xml-init)
@@ -1852,7 +1859,9 @@ Use CREATE-TEMP-F for creating temp copy."
 
 ;;;; xml-specific init-cleanup routines
 (defun flymake-xml-init ()
-  (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
+  (list flymake-xml-program
+        (list "val" (flymake-init-create-temp-buffer-copy
+                     'flymake-create-temp-inplace))))
 
 (provide 'flymake)