[Qemu-devel] [PATCH 2/2] .dir-locals.el: add json schema to auto-mode

[Marc-André Lureau]

The json schema is more friendly to python-mode since it doesn't
follow strictly json (comments to start with).

All schema files add file variables to set the python mode, but most
tests didn't. This will cover all json files now.

Signed-off-by: Marc-André Lureau <address@hidden>
---
 qapi-schema.json                        | 1 -
 qapi/block-core.json                    | 2 --
 qapi/block.json                         | 2 --
 qapi/common.json                        | 2 --
 qapi/crypto.json                        | 3 ---
 qapi/event.json                         | 2 --
 qapi/introspect.json                    | 1 -
 qapi/rocker.json                        | 2 --
 qapi/trace.json                         | 1 -
 .dir-locals.el                          | 4 +++-
 qga/qapi-schema.json                    | 2 --
 tests/qapi-schema/doc-good.json         | 1 -
 tests/qapi-schema/qapi-schema-test.json | 2 --
 13 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 802ea53d00..232fafeb65 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1,4 +1,3 @@
-# -*- Mode: Python -*-
 ##
 # = Introduction
 #
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 833c602150..5bd14554aa 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1,5 +1,3 @@
-# -*- Mode: Python -*-
-
 ##
 # == QAPI block core definitions (vm unrelated)
 ##
diff --git a/qapi/block.json b/qapi/block.json
index 414b61bde7..979906625d 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -1,5 +1,3 @@
-# -*- Mode: Python -*-
-
 ##
 # = QAPI block definitions
 ##
diff --git a/qapi/common.json b/qapi/common.json
index 8355d5a2f3..25a9fdcbfd 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -1,5 +1,3 @@
-# -*- Mode: Python -*-
-
 ##
 # = QAPI common definitions
 ##
diff --git a/qapi/crypto.json b/qapi/crypto.json
index 6b6fde367a..9ec7777603 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -1,6 +1,3 @@
-# -*- Mode: Python -*-
-#
-
 ##
 # = QAPI crypto definitions
 ##
diff --git a/qapi/event.json b/qapi/event.json
index 6d22b025cc..6f15ec1542 100644
--- a/qapi/event.json
+++ b/qapi/event.json
@@ -1,5 +1,3 @@
-# -*- Mode: Python -*-
-
 ##
 # = Other events
 ##
diff --git a/qapi/introspect.json b/qapi/introspect.json
index cf77ff0669..83eaed3e43 100644
--- a/qapi/introspect.json
+++ b/qapi/introspect.json
@@ -1,4 +1,3 @@
-# -*- Mode: Python -*-
 #
 # QAPI/QMP introspection
 #
diff --git a/qapi/rocker.json b/qapi/rocker.json
index 3587661161..0026c7fd59 100644
--- a/qapi/rocker.json
+++ b/qapi/rocker.json
@@ -1,5 +1,3 @@
-# -*- Mode: Python -*-
-
 ##
 # = Rocker switch device
 ##
diff --git a/qapi/trace.json b/qapi/trace.json
index de6588d9f7..679b1e298a 100644
--- a/qapi/trace.json
+++ b/qapi/trace.json
@@ -1,4 +1,3 @@
-# -*- mode: python -*-
 #
 # Copyright (C) 2011-2016 Lluís Vilanova <address@hidden>
 #
diff --git a/.dir-locals.el b/.dir-locals.el
index 13ec483765..46a6c73ed1 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,6 +2,8 @@
             (indent-tabs-mode . nil)))
  (nil . ((eval . (setq auto-mode-alist (append
                                         '(("Makefile.*" . makefile-gmake-mode)
-                                          ("\\.mak\\'" . makefile-gmake-mode))
+                                          ("\\.mak\\'" . makefile-gmake-mode)
+                                          ;; json schema is not pure json
+                                          ("\\.json\\'" . python-mode))
                                         auto-mode-alist))))
       ))
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 90a0c8602b..757bb42521 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -1,5 +1,3 @@
-# *-*- Mode: Python -*-*
-
 ##
 #
 # General note concerning the use of guest agent interfaces:
diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.json
index cfdc0a8a81..4a34eaf3d1 100644
--- a/tests/qapi-schema/doc-good.json
+++ b/tests/qapi-schema/doc-good.json
@@ -1,4 +1,3 @@
-# -*- Mode: Python -*-
 # Positive QAPI doc comment tests
 
 { 'pragma': { 'doc-required': true } }
diff --git a/tests/qapi-schema/qapi-schema-test.json 
b/tests/qapi-schema/qapi-schema-test.json
index c72dbd8050..6e5635ef66 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -1,5 +1,3 @@
-# *-*- Mode: Python -*-*
-
 # This file is a stress test of supported qapi constructs that must
 # parse and compile correctly.
 
-- 
2.14.1.146.gd35faa819