diff options
| author | Alan Pearce | 2015-03-30 10:07:15 +0100 |
|---|---|---|
| committer | Alan Pearce | 2015-03-30 10:07:15 +0100 |
| commit | 92142a8757c9f9d58716436dda38a0b0fe762a33 (patch) | |
| tree | db4c2fca3c1946cf43d6a468d9861c2345bd5a17 | |
| parent | 2bda6f9985d68b5e5b988e0d717812c15aff1a2d (diff) | |
| parent | 477ee903f470f7538e4ab3ffbff73ed31c24a1b5 (diff) | |
| download | dotfiles-92142a8757c9f9d58716436dda38a0b0fe762a33.tar.lz dotfiles-92142a8757c9f9d58716436dda38a0b0fe762a33.tar.zst dotfiles-92142a8757c9f9d58716436dda38a0b0fe762a33.zip | |
Merge branch 'master' of git://github.com/alanpearce/dotfiles
| -rw-r--r-- | tag-emacs/emacs.d/init.el | 21 | ||||
| -rwxr-xr-x | tag-zsh/config/zsh/zshrc | 5 |
2 files changed, 11 insertions, 15 deletions
diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el index e175204..c206112 100644 --- a/tag-emacs/emacs.d/init.el +++ b/tag-emacs/emacs.d/init.el @@ -228,6 +228,7 @@ completion-ignore-case t) (req-package smart-tab + :commands (global-smart-tab-mode) :init (global-smart-tab-mode) :config (progn (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function))) @@ -429,7 +430,6 @@ (req-package ws-butler :if window-system - :diminish highlight-changes-mode :config (ws-butler-global-mode 1)) (if (daemonp) (add-hook #'before-make-frame-hook (lambda () (ws-butler-global-mode 1)))) @@ -880,10 +880,11 @@ mouse-1: Display Line and Column Mode Menu")))))) (req-package go-mode :mode (("\\.go\\'" . go-mode))) -(req-package oracle - :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH")) - :init (progn - (add-hook 'go-mode-hook #'go-oracle-mode))) +(when (file-exists-p "src/code.google.com/p/go.tools/cmd/oracle/oracle.el") + (req-package oracle + :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH")) + :init (progn + (add-hook 'go-mode-hook #'go-oracle-mode)))) (req-package company-go :require go-mode @@ -1032,11 +1033,11 @@ mouse-1: Display Line and Column Mode Menu")))))) (add-hook 'eshell-load-hook (lambda () (bind-key "C-c C-l" #'helm-eshell-history eshell-mode-map))) (req-package em-smart - :init (progn - (setq eshell-where-to-jump 'begin - eshell-review-quick-commands nil - eshell-smart-space-goes-to-end t) - (eshell-smart-initialize))))) + :config (progn + (setq eshell-where-to-jump 'begin + eshell-review-quick-commands nil + eshell-smart-space-goes-to-end t) + (eshell-smart-initialize))))) (autoload #'eshell/cd "em-dirs") (defun eshell-goto-current-dir (&optional arg) diff --git a/tag-zsh/config/zsh/zshrc b/tag-zsh/config/zsh/zshrc index 4e5f1e3..3e4c7e8 100755 --- a/tag-zsh/config/zsh/zshrc +++ b/tag-zsh/config/zsh/zshrc @@ -177,10 +177,6 @@ unsetopt beep ############ # Keybinds # ############ -#KiTTY -bindkey "OD" backward-word -bindkey "OC" forward-word - #General bindkey "[1~" beginning-of-line bindkey "[4~" end-of-line @@ -376,7 +372,6 @@ else fi _FASD_DATA="$HOME/.cache/zsh/fasd-data" -autoload -U fasd if [[ -e ~/.config/zsh/fasd.zsh ]] then source ~/.config/zsh/fasd.zsh |