summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-03-21 01:01:32 -0400
committerKyle Meyer <kyle@kyleam.com>2014-03-21 01:10:56 -0400
commit0a8733cb13f6b384e3b614cb1dc9a6a2de64ff0e (patch)
treecc642c570fc2425fdba526192fbebbea95772660 /lisp
parentc4a12b2876182bce50c76fb3c232de9071996b0b (diff)
downloademacs.d-0a8733cb13f6b384e3b614cb1dc9a6a2de64ff0e.tar.gz
Tweak `hippie-expand-try-functions-list'
Removed line and list completion functions, which are almost never what I intend to complete. This should also take care of the clash with paredit mode (since these multi-word expansions shouldn't occur anymore), so I'm deleting `he-paredit-fix'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-editing.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/init-editing.el b/lisp/init-editing.el
index 74dd712..fbf959e 100644
--- a/lisp/init-editing.el
+++ b/lisp/init-editing.el
@@ -23,11 +23,14 @@
(global-set-key (kbd "C-'") 'backward-kill-word)
(global-set-key (kbd "M-/") 'hippie-expand)
-;; http://www.emacswiki.org/emacs/HippieExpand#toc9
-(defadvice he-substitute-string (after he-paredit-fix activate)
- "Remove extra paren when expanding line in paredit."
- (if (and paredit-mode (equal (substring str -1) ")"))
- (progn (backward-delete-char 1) (forward-char))))
+(setq hippie-expand-try-functions-list '(try-complete-file-name-partially
+ try-complete-file-name
+ try-expand-all-abbrevs
+ try-expand-dabbrev
+ try-expand-dabbrev-all-buffers
+ try-expand-dabbrev-from-kill
+ try-complete-lisp-symbol-partially
+ try-complete-lisp-symbol))
;; http://www.emacswiki.org/emacs/UnfillParagraph
(defun unfill-paragraph ()