aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-08-21 17:28:58 +0000
committerChong Yidong2008-08-21 17:28:58 +0000
commit4b6f7dc970e8aeff7106e4c7f38404277e6eba3f (patch)
tree6dd50f440fc1c38e8d46f67dc06773622a5f77bf
parentd7fa495a100f7b5637160c69de6d26425d7b11de (diff)
downloademacs-4b6f7dc970e8aeff7106e4c7f38404277e6eba3f.tar.gz
emacs-4b6f7dc970e8aeff7106e4c7f38404277e6eba3f.zip
(completion--try-word-completion): Disable partial-completion when
considering the addition of a space or hyphen.
-rw-r--r--lisp/minibuffer.el11
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d33bd5f9836..a59fac6d556 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -615,14 +615,9 @@ input if confirmed."
615 (let ((exts '(" " "-")) 615 (let ((exts '(" " "-"))
616 (before (substring string 0 point)) 616 (before (substring string 0 point))
617 (after (substring string point)) 617 (after (substring string point))
618 ;; If the user hasn't entered any text yet, then she 618 ;; Disable partial-completion for this.
619 ;; presumably hits SPC to see the *completions*, but 619 (completion-styles
620 ;; partial-completion will often find a " " or a "-" to match. 620 (remove 'partial-completion completion-styles))
621 ;; So disable partial-completion in that situation.
622 (completion-styles
623 (or (and (equal string "")
624 (remove 'partial-completion completion-styles))
625 completion-styles))
626 tem) 621 tem)
627 (while (and exts (not (consp tem))) 622 (while (and exts (not (consp tem)))
628 (setq tem (completion-try-completion 623 (setq tem (completion-try-completion