Update willow

1 files changed, 37 insertions, 9 deletions

diff --git a/emacs-willow b/emacs-willow
index cf7f5da..b96c25d 100644
--- a/emacs-willow
+++ b/emacs-willow
@@ -99,12 +99,15 @@
 (add-to-list 'default-frame-alist '(user-size . t))
 ;; frame font and color
 (add-to-list 'default-frame-alist
-             '(font . "-*-ProggyCleanTT-*-*-*-*-*-120-*-*-*-*-*"))
+             '(font . "-*-ProggyCleanTT-*-*-*-*-*-125-*-*-*-*-*"))
 (add-to-list 'default-frame-alist '(cursor-color . "green"))
 (add-to-list 'default-frame-alist '(foreground-color . "grey"))
 (add-to-list 'default-frame-alist '(background-color . "black"))
 (add-to-list 'default-frame-alist '(background-mode . "dark"))
 
+;; Workaround for emacs & enlightenment
+(setq x-set-frame-visibility-more-laxly 'focus-in)
+
 ;; Make man open in full frame instead of always creating half a frame
 (set-variable 'Man-notify-method (quote pushy))
 
@@ -155,8 +158,6 @@
   '(define-auto-insert
      '("\\.\\(CC?\\|cc\\|cxx\\|cpp\\|c++\\)\\'" . "C++ source")
      '(nil
-       "#include \"common.hh\"" \n
-       \n
        (let ((base (file-name-sans-extension buffer-file-name)))
          (cond
           ((file-exists-p
@@ -255,9 +256,11 @@
 
 ;; flycheck
 (require 'flycheck)
+(require 'flycheck-clangcheck)
 (global-flycheck-mode)
 (setq flycheck-check-syntax-automatically '(save new-line))
-(setq flycheck-python-pylint-executable "/usr/bin/python3")
+(setq flycheck-python-pylint-executable "/usr/bin/python3")'
+(setq flycheck-clangcheck-analyze t)
 
 ;; replace ch alias fro grep with cchh alias, ie if starting with a ".h" file
 ;; you might still want to search in cc files
@@ -288,13 +291,18 @@
 (make-variable-buffer-local 'flycheck-clang-include-path)
 (make-variable-buffer-local 'flycheck-clang-language-standard)
 
+;;            (setq flycheck-clang-language-standard "c++17"
+;;                  flycheck-clang-definitions '("HAVE_CONFIG_H")
+;;                  flycheck-clang-include-path
+;;                  '("../include" "../src" "../build" "/usr/include/taglib" "/usr/include/cairo"))
+
+(require 'google-c-style)
+
 (add-hook 'c++-mode-hook
           (lambda()
-            (setq flycheck-clang-language-standard "c++17"
-                  flycheck-clang-definitions '("HAVE_CONFIG_H")
-                  flycheck-clang-include-path
-                  '("../src" "../build" "/usr/include/taglib"))
-            (c-set-style "default c++")))
+            (flycheck-select-checker 'c/c++-clangcheck)
+            (google-set-c-style)
+            (setq c-file-style "Google")))
 
 ;; Opera Java hook
 (add-hook 'java-mode-hook
@@ -320,3 +328,23 @@
               (setq c-basic-offset 4))))
 
 ;;;
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; 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.
+ '(ido-vertical-pad-list nil)
+ '(package-selected-packages
+   '(flycheck-clangcheck meson-mode groovy-mode gradle-mode kotlin-mode flycheck ido-vertical-mode rg))
+ '(safe-local-variable-values
+   '((eval let
+           ((project-path
+             (locate-dominating-file default-directory ".dir-locals.el")))
+           (setq-local flycheck-clangcheck-build-path
+                       (concat project-path "build"))))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )