xserver: Branch 'master'

[Peter Hutterer]

 xkb/ddxLoad.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 30f4d440ebc3517fdcc1d3c6a422a8fbf3af1f23
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Oct 31 12:22:31 2017 -0700

    xkb: Print the xkbcomp path being executed when we fail to compile.
    
    I don't know how many times I've had a broken server due to a bad
    directory to xkbcomp, and only finding the whole path has shown me
    where I went wrong.
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index a1a0fd3a2..a8b8368a6 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -179,8 +179,10 @@ RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
 #endif
             return xnfstrdup(keymap);
         }
-        else
-            LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
+        else {
+            LogMessage(X_ERROR, "Error compiling keymap (%s) executing '%s'\n",
+                       keymap, buf);
+        }
 #ifdef WIN32
         /* remove the temporary file */
         unlink(tmpname);