diff options
| author |  Tom Willemsen | 2013-01-04 00:06:15 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-01-04 00:06:15 +0100 |
| commit | 12fbc83cc7637548bcefaed1d0b7aea81064c67f (patch) | |
| tree | 7cf66d3804a87e9154479d6d00f72d17002a14bf /.emacs.d/site-lisp/oni.el | |
| parent | ef288f8ad6c5fe22161fd55d69792e5d0f340b01 (diff) | |
| parent | 1be69078ad8c1af62de79b80345a72d2b8490b04 (diff) | |
| download | dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.tar.gz dotfiles-12fbc83cc7637548bcefaed1d0b7aea81064c67f.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.emacs.d/site-lisp/oni.el')
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index b3a7987..979e804 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -68,8 +68,10 @@ DOT are intentionally being skipped." "Function for `after-save-hook'." (oni:compile-el) (executable-make-buffer-file-executable-if-script-p) - (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile"))) - (when dom-dir + (let* ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile")) + (TAGSp (not (string= "" (shell-command-to-string + (concat "grep \"^TAGS:\" " dom-dir "Makefile")))))) + (when (and dom-dir TAGSp) (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1"))))) @@ -286,13 +288,6 @@ If COUNT has been specified indent by that much, otherwise look at (kill-region (region-beginning) (region-end)) (kill-line))) -(defun oni:load-hippie-exp (other) - "Make sure both hippie-expand and yasnippet are loaded in order - to add yasnippet's expand function to hippie-expand." - (require other) - (add-to-list 'hippie-expand-try-functions-list - 'yas/hippie-try-expand t)) - (defun oni:lua-mode-func() "Function for `lua-mode-hook'." (local-unset-key (kbd ")")) @@ -601,6 +596,7 @@ If no direction is given, don't split." (defun oni:texinfo-mode-func () "Function for `texinfo-mode-hook'." + (setq-local comment-auto-fill-only-comments nil) (auto-fill-mode)) (defun oni:view-mail (inbox) @@ -624,7 +620,8 @@ for easy selection." (defun oni:yas-minor-mode-func () "Function for `yas-minor-mode-hook'." (define-key yas-minor-mode-map (kbd "TAB") nil) - (define-key yas-minor-mode-map [(tab)] nil)) + (define-key yas-minor-mode-map [(tab)] nil) + (define-key yas-minor-mode-map (kbd "C-\\") 'yas-expand)) (define-skeleton html-tag "Testing creation of an html tag" |