Merge remote-tracking branch 'refs/remotes/origin/master'
2 files changed, 8 insertions(+), 16 deletions(-)
jump to
M emacs/init.el → emacs/init.el
@@ -311,7 +311,8 @@ :commands (company-mode) :bind (("C-<tab>" . company-complete)) :init (progn (add-hook 'prog-mode-hook #'company-mode) - (setq company-idle-delay .3))) + (setq company-idle-delay .3 + company-begin-commands '(self-insert-command)))) ;;;; Dates & Times@@ -497,12 +498,12 @@ (bind-key "C-x C-j" #'delete-indentation) (unbind-key "C-x C-c") (bind-key "C-c i" #'ucs-insert) +(bind-key "M-/" #'hippie-expand) (unbind-key "s-h") (unbind-key "s-n") (unbind-key "s-p") (unbind-key "s-w") -(unbind-key "s-m") (bind-key "s-x" (define-prefix-command 'super-x-map))@@ -1138,20 +1139,6 @@ (use-package jinja2-mode :ensure t :mode (("\\.j2\\'" . jinja2-mode))) - -(use-package nxhtml-mode - :defer t - :if (eq env/system-type 'laptop) - :load-path "nxhtml" - :config (progn - (when (and (equal emacs-major-version 24) - (> emacs-minor-version 1)) - (setq mumamo-per-buffer-local-vars - (delq 'buffer-file-name mumamo-per-buffer-local-vars))) - (setq mumamo-chunk-coloring 4 - nxhtml-skip-welcome t - nxhtml-autoload-web nil) - (nxhtml-menu-mode -1))) (use-package php-mode :mode ("\\.php\\'" . php-mode)
M install → install
@@ -47,6 +47,11 @@ then emacs --batch --eval '(batch-byte-recompile-directory 0)' ~/.emacs.d/ fi +if [[ ! -d ~/.zsh/cache ]] +then + mkdir -p ~/.zsh/cache +fi + fasd_cache=~/.zsh/cache/fasd-init-zsh if [[ ! -s "$fasd_cache" || dotfiles/zsh/functions/fasd -nt "$fasd_cache" ]]; then dotfiles/zsh/functions/fasd/fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install >! "$fasd_cache"