diff options
| author | Romain Francoise | 2007-09-06 17:12:17 +0000 |
|---|---|---|
| committer | Romain Francoise | 2007-09-06 17:12:17 +0000 |
| commit | 9a8b3a5cd45083e212979e75bedaaef31e5aa68b (patch) | |
| tree | e91a1ed54af3d40bbf310681af2eb2d1b4169277 | |
| parent | 8aee12d0337c075441bacd287a5673be7be98493 (diff) | |
| download | emacs-9a8b3a5cd45083e212979e75bedaaef31e5aa68b.tar.gz emacs-9a8b3a5cd45083e212979e75bedaaef31e5aa68b.zip | |
2007-09-06 Sean O'Rourke <sorourke@cs.ucsd.edu>
* complete.el (PC-do-completion): Don't try to treat
empty string as an abbreviation.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/complete.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 187f9183a5d..0982a0b026f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-09-06 Sean O'Rourke <sorourke@cs.ucsd.edu> | ||
| 2 | |||
| 3 | * complete.el (PC-do-completion): Don't try to treat | ||
| 4 | empty string as an abbreviation. | ||
| 5 | |||
| 1 | 2007-09-06 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> | 6 | 2007-09-06 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se> |
| 2 | 7 | ||
| 3 | * help-fns.el (describe-variable): Keep doc's text properties. | 8 | * help-fns.el (describe-variable): Keep doc's text properties. |
diff --git a/lisp/complete.el b/lisp/complete.el index 01db126c5f8..bc581052508 100644 --- a/lisp/complete.el +++ b/lisp/complete.el | |||
| @@ -596,9 +596,10 @@ GOTO-END is non-nil, however, it instead replaces up to END." | |||
| 596 | (setq poss (all-completions (if env-on basestr str) | 596 | (setq poss (all-completions (if env-on basestr str) |
| 597 | table | 597 | table |
| 598 | pred)) | 598 | pred)) |
| 599 | (unless poss | 599 | (unless (or poss (string-equal str "")) |
| 600 | ;; Try completion as an abbreviation, e.g. "mvb" -> | 600 | ;; Try completion as an abbreviation, e.g. "mvb" -> |
| 601 | ;; "m-v-b" -> "multiple-value-bind" | 601 | ;; "m-v-b" -> "multiple-value-bind", but only for |
| 602 | ;; non-empty strings. | ||
| 602 | (setq origstr str | 603 | (setq origstr str |
| 603 | abbreviated t) | 604 | abbreviated t) |
| 604 | (if filename | 605 | (if filename |