From 142e29561966e9a991145947b52a763f9906658c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:26:51 +0100
Subject: Emacs: Use js2-mode for jsx files

---
 tag-emacs/emacs.d/init.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 2c86143..7eff008 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1940,7 +1940,8 @@ it though
 
 #+BEGIN_SRC emacs-lisp
   (use-package js2-mode
-    :mode ("\\.js\\'" . js2-mode)
+    :mode (("\\.js\\'" . js2-mode)
+           ("\\.jsx\\'" . js2-jsx-mode))
     :functions js2-next-error
     :config (progn
               (defun ap/javascript-setup ()
@@ -2043,8 +2044,7 @@ of them as well.
     :mode (("/views/.*\\.php\\'" . web-mode)
            ("/layouts/.*\\.html\\'" . web-mode)
            ("/templates/.*\\.php\\'" . web-mode)
-           ("\\.ejs\\'" . web-mode)
-           ("\\.jsx\\'" . web-mode))
+           ("\\.ejs\\'" . web-mode))
     :config (setq web-mode-code-indent-offset 4
                   web-mode-css-indent-offset 4
                   web-mode-markup-indent-offset 4
-- 
cgit 1.4.1


From 3477d9f8e72164366e7c222515082f47b6d9a962 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:38:17 +0100
Subject: Emacs: Open composer.lock files with json-mode

---
 tag-emacs/emacs.d/init.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 01cae19..cf2b362 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1956,8 +1956,6 @@ it though
               (add-hook 'js2-mode-hook #'ap/javascript-setup)
               (setq js2-basic-offset 4
                     js2-include-node-externs t)))
-
-  (add-to-list 'auto-mode-alist '("composer\\.lock" . js-mode))
 #+END_SRC
 
 *** coffee-mode
@@ -1993,7 +1991,8 @@ completions, besides other IDE-like things.
 #+BEGIN_SRC emacs-lisp
   (use-package json-mode
     :mode (("\\.json\\'" . json-mode)
-           ("\\.sailsrc\\'" . json-mode)))
+           ("\\.sailsrc\\'" . json-mode)
+           ("composer\\.lock\\'" . json-mode)))
 #+END_SRC
 
 *** restclient
-- 
cgit 1.4.1


From 839dd59b474a365419f921600ed5aaea8add628b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:41:46 +0100
Subject: Formatting

---
 tag-emacs/emacs.d/init.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index cf2b362..1bdfac0 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1659,8 +1659,7 @@ I can use this to keep a journal.  I should use it.
                             (dolist (file (org-mobile-files-alist))
                               (if (string= (file-truename (expand-file-name (car file)))
                                            (file-truename (buffer-file-name)))
-                                  (org-mobile-push-with-delay 30)))
-                            )))
+                                  (org-mobile-push-with-delay 30))))))
 
               (run-at-time "00:05" 86400 '(lambda () (org-mobile-push-with-delay 1))) ;; refreshes agenda file each day
               (org-mobile-pull) ;; run org-mobile-pull at startup
-- 
cgit 1.4.1


From b49b2c6b5057689e3d2b22c7f8deb4a68e834e97 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:42:10 +0100
Subject: Emacs: Remove */5 minute org-mobile pull

---
 tag-emacs/emacs.d/init.org | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 1bdfac0..012c4da 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1676,11 +1676,7 @@ I can use this to keep a journal.  I should use it.
                                 (concat
                                  (file-name-as-directory org-mobile-directory)
                                  org-mobile-capture-file))
-                               5)
-
-              ;; Do a pull every 5 minutes to circumvent problems with timestamping
-              ;; (ie. dropbox bugs)
-              (run-with-timer 0 (* 5 60) 'org-mobile-pull)))))
+                               5)))))
 #+END_SRC
 
 * Programming
-- 
cgit 1.4.1


From c8d119ca0f83776fd27574c25fd0b4c2ce890605 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:45:01 +0100
Subject: Emacs: Fix bad window-splitting on laptop

---
 tag-emacs/emacs.d/init.org | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 012c4da..b67cb29 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -903,6 +903,7 @@ point whilst I’m moving about.
         scroll-preserve-screen-position t
         mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control)))
         split-height-threshold 100
+        split-width-threshold 70
         frame-resize-pixelwise t)
   (if (boundp 'ns-pop-up-frames)
       (setq ns-pop-up-frames nil))
-- 
cgit 1.4.1