General clean-up and tiny bugfixes

Cask

@@ -60,11 +60,6 @@
 ;; Completion --- core/core-company.el
 (depends-on "company")
 (depends-on "company-statistics")
-(depends-on "company-quickhelp")
-(depends-on "company-anaconda")
-(depends-on "company-c-headers")
-(depends-on "company-inf-ruby")
-(depends-on "company-tern")
 
 ;; Collab --- core/core-collab.el
 (depends-on "impatient-mode")
@@ -110,6 +105,7 @@
 ;; C/C++ -- modules/module-cc.el
 (depends-on "cmake-mode")
 (depends-on "glsl-mode")
+(depends-on "company-c-headers")
 
 ;; Crystal -- modules/module-crystal.el
 (depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode")
@@ -142,6 +138,7 @@
 (depends-on "typescript-mode")
 (depends-on "tide")
 (depends-on "coffee-mode")
+(depends-on "company-tern")
 
 ;; Lua -- modules/module-lua.el
 (depends-on "lua-mode")
@@ -155,7 +152,7 @@
 (depends-on "company-math")
 (depends-on "ob-http")
 
-;; PHP -- modules/module-php.el
+;; PlantUML -- modules/module-plantuml.el
 (depends-on "puml-mode")
 
 ;; PHP -- modules/module-php.el
@@ -180,6 +177,7 @@
 (depends-on "rspec-mode")
 (depends-on "inf-ruby")
 (depends-on "robe")
+(depends-on "company-inf-ruby")
 
 ;; Rust -- modules/module-rust.el
 (depends-on "rust-mode")

core/core-editor.el

@@ -96,7 +96,7 @@ enable multiple minor modes for the same regexp.")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; (global-whitespace-mode 1)  ; Show whitespace
-;; (global-auto-revert-mode -1); revert buffers for changed files
+(global-auto-revert-mode 1)    ; revert buffers for changed files
 (global-font-lock-mode t)      ; Enable syntax highlighting for older emacs
 (electric-indent-mode -1)      ; on by default
 

core/core-os-osx.el

@@ -11,10 +11,9 @@
       ;; sane trackpad/mouse scroll settings
       mac-redisplay-dont-reset-vscroll t
       mac-mouse-wheel-smooth-scroll nil
-      mouse-wheel-scroll-amount '(8 ((shift) . 2))  ;; one line at a time
+      mouse-wheel-scroll-amount '(6 ((shift) . 2))  ;; one line at a time
       mouse-wheel-progressive-speed nil             ;; don't accelerate scrolling
 
-
       ;;; NOTE These mean nothing to railwaycat's emacs-mac build on OSX
       ;; Curse Lion and its sudden but inevitable fullscreen mode!
       ns-use-native-fullscreen nil

core/core-project.el

@@ -32,7 +32,9 @@
     (ido-vertical-mode 1)
     (require 'flx-ido)
     (flx-ido-mode 1)
-    (bind! :map (ido-common-completion-map ido-completion-map ido-file-completion-map)
+    (bind! :map (ido-common-completion-map
+                 ido-completion-map
+                 ido-file-completion-map)
            "C-n" 'ido-next-match
            "C-p" 'ido-prev-match
            "C-w" 'ido-delete-backward-word-updir
@@ -85,6 +87,10 @@
   (add-hook! neotree-mode 'narf|neotree-init-keymap)
   (add-hook! window-configuration-change 'narf|neotree-close-on-window-change)
 
+  (when neo-persist-show
+    (add-hook! 'popwin:before-popup-hook (setq neo-persist-show nil))
+    (add-hook! 'popwin:after-popup-hook  (setq neo-persist-show t)))
+
   (evil-set-initial-state 'neotree-mode 'motion)
   (after! projectile
     (setq projectile-switch-project-action 'neotree-projectile-action))

core/core-workgroups.el

@@ -4,7 +4,7 @@
 (use-package workgroups2
   :when window-system
   :init
-  (setq split-height-threshold 15
+  (setq split-height-threshold 10
 
         wg-session-file          (expand-file-name "wg-default" narf-temp-dir)
         wg-workgroup-directory   (expand-file-name "workgroups" narf-temp-dir)
@@ -12,7 +12,6 @@
         wg-session-load-on-start t
         wg-mode-line-display-on  nil
         wg-mess-with-buffer-list t
-        ;; What to do on Emacs exit / workgroups-mode exit?
         wg-emacs-exit-save-behavior           'save ; Options: 'save 'ask nil
         wg-workgroups-mode-exit-save-behavior 'save
         wg-log-level 0
@@ -31,8 +30,7 @@
   (defvar narf-wg-frames '())
 
   (after! projectile
-    ;; Turns projectile switch-project interface (or helm's interface to it)
-    ;; create a new workgroup for the new project.
+    ;; Create a new workgroup on switch-project
     (setq projectile-switch-project-action 'narf/wg-projectile-switch-project))
 
   ;; Initialize!

core/lib/defuns-editor.el

@@ -28,7 +28,7 @@
   (when *linum-mdown-line*
     (let (mu-line)
       (setq mu-line (narf--line-at-click))
-      (goto-line linum-mdown-line*)
+      (goto-line *linum-mdown-line*)
       (if (> mu-line *linum-mdown-line*)
           (progn
             (set-mark (point))
@@ -37,7 +37,7 @@
         (set-mark (line-end-position))
         (goto-line mu-line)
         (beginning-of-line))
-      (setq *linum-mdown* nil))))
+      (setq *linum-mdown-line* nil))))
 
 (provide 'defuns-editor)
 ;;; defuns-editor.el ends here

modules/module-rust.el

@@ -1,13 +1,5 @@
 ;;; module-rust.el
 
-;; NOTE Install instructions
-;; brew install rust
-;; git clone https://github.com/phildawes/racer.git ~
-;; cd ~/racer
-;; cargo build --release
-;; mv ~/racer/release/racer /usr/local/bin
-;; rm -rf ~/racer
-
 (use-package rust-mode
   :mode "\\.rs$"
   :config

modules/module-web.el

@@ -80,10 +80,13 @@
 (use-package emmet-mode
   :defer t
   :diminish emmet-mode
-  :init (add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
+  :init
+  (add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
+  (defvar emmet-mode-keymap (make-sparse-keymap))
   :config
   (setq emmet-move-cursor-between-quotes t)
   (bind! :map emmet-mode-keymap
+         :v "M-e" 'emmet-wrap-with-markup
          :i "M-e" 'emmet-expand-yas
          :i "M-E" 'emmet-expand-line))