diff options
| author | Alan Pearce | 2013-09-02 21:21:08 +0100 |
|---|---|---|
| committer | Alan Pearce | 2013-09-02 21:21:08 +0100 |
| commit | c8dfdd15c8712ff5ca24dc713b585e9a568adbdb (patch) | |
| tree | 780df9f8b7de74a44fb1d5fd0784f9e44faaf444 | |
| parent | 4995c1c2200c7ca5c20a1de0aad3f8a465fb911d (diff) | |
| parent | 13ddd4cb0f91cb6c78f94eb5fa8bbee1b5b83920 (diff) | |
| download | dotfiles-c8dfdd15c8712ff5ca24dc713b585e9a568adbdb.tar.lz dotfiles-c8dfdd15c8712ff5ca24dc713b585e9a568adbdb.tar.zst dotfiles-c8dfdd15c8712ff5ca24dc713b585e9a568adbdb.zip | |
Merge branch 'master' of server.home:dotfiles
| -rw-r--r-- | emacs/init.el | 16 | ||||
| -rw-r--r-- | gitconfig | 2 | ||||
| -rw-r--r-- | global.gitignore | 23 |
3 files changed, 38 insertions, 3 deletions
diff --git a/emacs/init.el b/emacs/init.el index 4eab004..337d663 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -539,7 +539,9 @@ Values: `desktop', `server', `laptop'") (ido-mode 1) (setq ido-decorations (quote ("\n›" "" "\n " "\n …" "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]"))) (setq ido-auto-merge-delay-time 99999 - ido-enable-flex-matching t) + ido-enable-flex-matching t + ido-save-directory-list-file (expand-file-name user-emacs-directory + "ido-state")) (ido-init-completion-maps) (defun ido-manual-merge () (interactive) @@ -557,13 +559,13 @@ Values: `desktop', `server', `laptop'") (setq smex-history-length 100 smex-save-file (concat user-emacs-directory "smex-items")) - (smex-initialize) (setq smex-key-advice-ignore-menu-bar t smex-auto-update nil) (defun smex-update-after-load (unused) (if (boundp 'smex-cache) (smex-update))) - (add-hook 'after-load-functions 'smex-update-after-load))) + (add-hook 'after-load-functions 'smex-update-after-load)) + :init (smex-initialize)) ;;;; Modeline @@ -1168,6 +1170,14 @@ Works with: arglist-cont-nonempty, arglist-close." :defer t :config (setq sgml-basic-offset 4)) +(use-package web-mode + :defer t + :mode (("/views/.*\\.php\\'" . web-mode) + ("/templates/.*\\.php\\'" . web-mode)) + :config (setq web-mode-code-indent-offset 4 + web-mode-css-indent-offset 4 + web-mode-markup-indent-offset 4)) + ;;;; Windows & Frames (setq frame-title-format diff --git a/gitconfig b/gitconfig index 0e4d5af..9d61670 100644 --- a/gitconfig +++ b/gitconfig @@ -21,3 +21,5 @@ user = alan@alanpearce.co.uk [diff] algorithm = patience +[core] + excludesfile = /Users/alan/dotfiles/global.gitignore diff --git a/global.gitignore b/global.gitignore new file mode 100644 index 0000000..02b15bf --- /dev/null +++ b/global.gitignore @@ -0,0 +1,23 @@ +.DS_Store +.AppleDouble +.LSOverride +Icon +Desktop.ini + +# Thumbnails +._* +Thumbs.db + +# Emacs +*~ +\#*\# +/.emacs.desktop +/.emacs.desktop.lock +.elc +auto-save-list +tramp +.\#* + +# Org-mode +.org-id-locations +*_archive \ No newline at end of file |