(choose-completion):

Include words separated by single spaces in the completion.

diff --git a/lisp/simple.el b/lisp/simple.el
index 326082318bce9d1659e7eba7a1c77e6d218eaec7..5f58d18e74ebbae7d5070d0e843c138ae2d88af9 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2438,8 +2438,16 @@ it were the arg to `interactive' (which see) to interactively read the value."
   (interactive)
   (let (beg end)
     (skip-chars-forward "^ \t\n")
+    (while (looking-at " [^ \n\t]")
+      (forward-char 1)
+      (skip-chars-forward "^ \t\n"))
     (setq end (point))
     (skip-chars-backward "^ \t\n")
+    (while (and (= (preceding-char) ?\ )
+               (not (and (> (point) (1+ (point-min)))
+                         (= (char-after (- (point) 2)) ?\ ))))
+      (backward-char 1)
+      (skip-chars-backward "^ \t\n"))
     (setq beg (point))
     (choose-completion-string (buffer-substring beg end))))