Merge branch 'windows' into develop

custom.el

@@ -5,7 +5,7 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(ahs-case-fold-search nil t)
+ '(ahs-case-fold-search nil)
  '(command-log-mode-window-size 50)
  '(company-dabbrev-minimum-length 3)
  '(company-dabbrev-other-buffers nil)
@@ -63,8 +63,6 @@
  '(ahs-face ((t (:foreground "#d33682" :weight bold))))
  '(command-log-command ((t (:foreground "dark magenta"))))
  '(command-log-key ((t (:foreground "dark cyan"))))
- '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
- '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil))))
  '(git-gutter-fr:added ((t (:foreground "#859900" :weight bold :width extra-expanded))))
  '(iedit-occurrence ((t (:inherit cursor))))
  '(ivy-virtual ((t (:background "skyblue"))))

init.el

@@ -74,7 +74,7 @@ values."
      ;; ruby-on-rails
      lua
      html
-     javascript
+     (javascript :variables javascript-backend 'nil)
      (typescript :variables
                 typescript-fmt-on-save nil
                 typescript-fmt-tool 'typescript-formatter)
@@ -96,7 +96,7 @@ values."
    ;; A list of packages that cannot be updated.
    dotspacemacs-frozen-packages '()
    dotspacemacs-excluded-packages
-   '(magit-gh-pulls magit-gitflow  evil-mc realgud
+   '(magit-gh-pulls magit-gitflow  evil-mc realgud tern company-tern
                     evil-args evil-ediff evil-exchange evil-unimpaired
                     evil-indent-plus volatile-highlights smartparens
                     spaceline holy-mode skewer-mode rainbow-delimiters
@@ -303,7 +303,7 @@ values."
    ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode'
    ;; derivatives. If set to `relative', also turns on relative line numbers.
    ;; (default nil)
-   dotspacemacs-line-numbers 'relative
+   dotspacemacs-line-numbers nil
    ;; Code folding method. Possible values are `evil' and `origami'.
    ;; (default 'evil)
    dotspacemacs-folding-method 'origami
@@ -429,6 +429,9 @@ values."
       (fundamental-mode)))
   (spacemacs/set-leader-keys "otm" 'zilongshanren/toggle-major-mode)
 
+  (setq inhibit-compacting-font-caches t)
+  (global-display-line-numbers-mode -1)
+
   ;; (add-hook 'text-mode-hook 'spacemacs/toggle-spelling-checking-on)
   )
 

layers/zilongshanren-better-defaults/config.el

@@ -144,7 +144,8 @@ Single Capitals as you type."
            (hl-line-mode -1)))
   (if (and (executable-find "wc")
            (> (string-to-number (shell-command-to-string (format "wc -l %s" (buffer-file-name))))
-              5000))))
+              5000))
+      nil))
 
 (add-hook 'find-file-hook 'spacemacs/check-large-file)
 

layers/zilongshanren-programming/funcs.el

@@ -153,8 +153,8 @@ version 2015-08-21"
     (setq imenu-create-index-function 'js2-imenu-make-index)
 
     (setq mode-name "JS2")
-    (define-key js2-mode-map   (kbd "s-.") 'company-tern)
-    (spacemacs/toggle-syntax-checking-on)
+
+    ;; (spacemacs/toggle-syntax-checking-on)
     (setq forward-sexp-function nil)
     (set (make-local-variable 'semantic-mode) nil)))
 

layers/zilongshanren-programming/packages.el

@@ -289,10 +289,6 @@
     (setq company-backends-js2-mode '((company-dabbrev-code :with company-keywords company-etags)
                                       company-files company-dabbrev))
 
-    (zilongshanren|toggle-company-backends company-tern)
-
-    (spacemacs/set-leader-keys-for-major-mode 'js2-mode
-      "tb" 'zilong/company-toggle-company-tern)
 
     (add-hook 'js2-mode-hook 'my-js2-mode-hook)
 
@@ -346,8 +342,6 @@
         (spacemacs/declare-prefix-for-mode 'css-mode "mt" "toggle")
 
 
-        (eval-after-load 'tern-mode
-          '(spacemacs|hide-lighter tern-mode))
         ))
 
     (evilified-state-evilify js2-error-buffer-mode js2-error-buffer-mode-map)
@@ -527,7 +521,7 @@
           company-idle-delay 0.08)
 
     (when (configuration-layer/package-usedp 'company)
-      (spacemacs|add-company-backends :modes shell-script-mode makefile-bsdmake-mode sh-mode lua-mode nxml-mode conf-unix-mode json-mode graphviz-dot-mode))
+      (spacemacs|add-company-backends :modes shell-script-mode makefile-bsdmake-mode sh-mode lua-mode nxml-mode conf-unix-mode json-mode graphviz-dot-mode js2-mode))
     ))
 (defun zilongshanren-programming/post-init-company-c-headers ()
   (progn

layers/zilongshanren/config.el

@@ -8,8 +8,8 @@
   "blog-admin files location")
 
 (setq-default
- org-agenda-dir "~/org-notes"
- deft-dir "~/org-notes"
+ org-agenda-dir "f:/org-notes"
+ deft-dir "f:/org-notes"
  blog-admin-dir "~/zilongshanren.com")
 
 ;;load sensitive data