diff options
| author | Alan Pearce | 2016-01-19 09:49:26 +0100 |
|---|---|---|
| committer | Alan Pearce | 2016-01-19 09:49:26 +0100 |
| commit | f20aabc16e189c743efe49f79de4a1903b54e6dc (patch) | |
| tree | ad754f17da6a61e3ba830b707421dc69a5de7aef /tag-emacs | |
| parent | f76ee457eed29f39f9db4521ac881389d45f3706 (diff) | |
| parent | c8d119ca0f83776fd27574c25fd0b4c2ce890605 (diff) | |
| download | nixfiles-f20aabc16e189c743efe49f79de4a1903b54e6dc.tar.lz nixfiles-f20aabc16e189c743efe49f79de4a1903b54e6dc.tar.zst nixfiles-f20aabc16e189c743efe49f79de4a1903b54e6dc.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tag-emacs')
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index abb64c31..558d516e 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)) @@ -1668,8 +1669,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 @@ -1686,11 +1686,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 @@ -1951,7 +1947,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 () @@ -1964,8 +1961,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 @@ -2001,7 +1996,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 @@ -2054,8 +2050,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 |