[Emacs-diffs] /srv/bzr/emacs/trunk r112575: * lisp/progmodes/flymake.el (flymake-xml-program): New option.

[Glenn Morris]

------------------------------------------------------------
revno: 112575
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-13 22:42:17 -0400
message:
  * lisp/progmodes/flymake.el (flymake-xml-program): New option.
  (flymake-xml-init): Use it.
modified:
  lisp/ChangeLog
  lisp/progmodes/flymake.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-14 02:08:35 +0000
+++ b/lisp/ChangeLog    2013-05-14 02:42:17 +0000
@@ -1,5 +1,8 @@
 2013-05-14  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2013-05-09 01:40:20 +0000
+++ b/lisp/progmodes/flymake.el 2013-05-14 02:42:17 +0000
@@ -257,6 +257,13 @@
   :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 @@
 
 ;;;; 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)