From 26b1e5efcfa8c251f4fae9aef850bd6722ba95ab Mon Sep 17 00:00:00 2001
From: Sameer Rahmani <lxsameer@gnu.org>
Date: Sun, 27 Dec 2015 16:18:48 +0330
Subject: [PATCH] jsx mode updated

---
 fg42-config.el             |  8 ++++----
 lib/extensions/web/init.el | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/fg42-config.el b/fg42-config.el
index da20757..d82e2e6 100644
--- a/fg42-config.el
+++ b/fg42-config.el
@@ -1,5 +1,5 @@
 (add-to-list 'load-path (concat (getenv "FG42_HOME") "/lib"))
-(toggle-debug-on-error)
+;(toggle-debug-on-error)
 (require 'fg42)
 
 ;; Load the default theme
@@ -14,9 +14,9 @@
                      'web
                      'editor-theme
                      'javascript
-                     'php
-                     'clojure
-                     'python
+                     ;'php
+                     ;'clojure
+                     ;'python
                      'ruby)
 
 ;; Load user config file in ~/.fg42
diff --git a/lib/extensions/web/init.el b/lib/extensions/web/init.el
index bdebb7d..0c8ab7d 100644
--- a/lib/extensions/web/init.el
+++ b/lib/extensions/web/init.el
@@ -41,19 +41,24 @@
     :modes (web-mode))
 
   (add-hook 'web-mode-hook
-          (lambda ()
-            (when (equal web-mode-content-type "jsx")
-              ;; enable flycheck
-              (flycheck-select-checker 'jsxhint-checker)
-              (flycheck-mode))))
+            (lambda ()
+              (when (equal web-mode-content-type "jsx")
+                ;; enable flycheck
+                (flycheck-select-checker 'jsxhint-checker)
+                (flycheck-mode))))
 
   (defadvice web-mode-highlight-part (around tweak-jsx activate)
     (if (equal web-mode-content-type "jsx")
         (let ((web-mode-enable-part-face nil))
           ad-do-it)
       ad-do-it))
+
+  (setq web-mode-markup-indent-offset 2)
+  (setq web-mode-code-indent-offset 2)
+
   (setq web-mode-content-types-alist
-        '(("jsx" . "\\.js[x]?\\'")))
+        '(("jsx"  . "\\.js[x]?\\'")))
+
   (web-mode))
 
 ;;;###autoload
@@ -74,7 +79,7 @@
            (add-to-list 'auto-mode-alist '("\\.handlebars\\'" . web-mode))
            (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
            (add-to-list 'auto-mode-alist '("\\.html$" . web-mode))
-
+           (add-to-list 'auto-mode-alist '("\\.jsx$" . jsx))
 
            (add-hook 'web-mode-hook 'web-mode-hook-func)
            (add-hook 'web-mode-hook 'emmet-mode)