diff --git a/core/core-company.el b/core/core-company.el index 0bbda662b..bce514db7 100644 --- a/core/core-company.el +++ b/core/core-company.el @@ -50,7 +50,7 @@ (define-key company-active-map (kbd "C-w") nil) (shut-up! - (setq company-statistics-file (! (concat narf-temp-dir "company-statistics-cache.el"))) + (setq company-statistics-file (concat narf-temp-dir "company-stats-cache.el")) (require 'company-statistics) (company-statistics-mode)) diff --git a/core/core-os-osx.el b/core/core-os-osx.el index 9843f36da..8e91edb84 100644 --- a/core/core-os-osx.el +++ b/core/core-os-osx.el @@ -19,10 +19,10 @@ (when window-system (setenv "SHELL" "/usr/local/bin/zsh") (setenv "EMACS" "1") ; make sure the world knows - - (setq exec-path (! (require 'exec-path-from-shell) - (exec-path-from-shell-initialize) - exec-path))) + (setq exec-path (eval-when-compile + (require 'exec-path-from-shell) + (exec-path-from-shell-initialize) + exec-path))) ;; OSX Related Plugins ;;;;;;;;;;;;;;;;; diff --git a/core/core-project.el b/core/core-project.el index b3f2681a7..9bde9cd48 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -16,13 +16,14 @@ ido-create-new-buffer 'always ido-enable-tramp-completion t ido-enable-last-directory-history t - ido-save-directory-list-file (! (concat narf-temp-dir "ido.last"))) + ido-save-directory-list-file (concat narf-temp-dir "ido.last")) :config (add-to-list 'ido-ignore-files "\\`.DS_Store$") (add-to-list 'ido-ignore-files "Icon\\?$") (ido-mode 1) (ido-everywhere 1) + (require 'ido-ubiquitous) (ido-ubiquitous-mode 1) diff --git a/core/core-workgroups.el b/core/core-workgroups.el index 6a5bd2e5c..12877131d 100644 --- a/core/core-workgroups.el +++ b/core/core-workgroups.el @@ -4,8 +4,8 @@ (use-package workgroups2 :when window-system :init - (setq wg-session-file (! (expand-file-name "wg-default" narf-temp-dir)) - wg-workgroup-directory (! (expand-file-name "workgroups" narf-temp-dir)) + (setq wg-session-file (expand-file-name "wg-default" narf-temp-dir) + wg-workgroup-directory (expand-file-name "workgroups" narf-temp-dir) wg-first-wg-name "main" wg-session-load-on-start t wg-mode-line-display-on nil