aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2010-08-02 16:23:50 +0200
committerStefan Monnier2010-08-02 16:23:50 +0200
commita2077b7f8f31af20194cfefb3328cfbd01766b9b (patch)
tree9d7402175ac72ba739b7070d33ef6a0a1d7bd0cc
parentee301a7a199b30502c45bc62a29a8523b3b03765 (diff)
downloademacs-a2077b7f8f31af20194cfefb3328cfbd01766b9b.tar.gz
emacs-a2077b7f8f31af20194cfefb3328cfbd01766b9b.zip
* bindings.el (complete-symbol): Run completion-at-point as a fallback.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/bindings.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11fdeae6eaa..1d7cfe90f9b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-08-02 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * bindings.el (complete-symbol): Run completion-at-point as a fallback.
4
12010-08-02 Juanma Barranquero <lekktu@gmail.com> 52010-08-02 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * term.el (term-delimiter-argument-list): Reflow docstring. 7 * term.el (term-delimiter-argument-list): Reflow docstring.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 3ec43b3041f..3ce21a578d5 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -688,6 +688,7 @@ language you are using."
688 (fboundp 'semantic-active-p) 688 (fboundp 'semantic-active-p)
689 (semantic-active-p)) 689 (semantic-active-p))
690 (semantic-ia-complete-symbol)) 690 (semantic-ia-complete-symbol))
691 (completion-at-point-functions (completion-at-point))
691 (t 692 (t
692 (error "%s" 693 (error "%s"
693 (substitute-command-keys 694 (substitute-command-keys