mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Make pcomplete less eager to add an extra space.

Browse Source 
* comint.el (comint--complete-file-name-data): Don't add a space
if the status is `sole'; that adds a gratuitous space in the
completion-cycling case.

* pcomplete.el (pcomplete-completions-at-point): Likewise.

Fixes: debbugs:12092
This commit is contained in:
Chong Yidong 2012-09-17 22:45:51 +08:00
parent caf4040f9e
commit 580bd8683b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@ -1,3 +1,11 @@
2012-09-17 Chong Yidong <cyd@gnu.org>
* comint.el (comint--complete-file-name-data): Don't add a space
if the status is `sole'; that adds a gratuitous space in the
completion-cycling case (Bug#12092).
* pcomplete.el (pcomplete-completions-at-point): Likewise.
2012-09-17 Richard Stallman <rms@gnu.org> 2012-09-17 Richard Stallman <rms@gnu.org>
* mail/rmailmm.el (rmail-mime-toggle-raw): Do rmail-mime-insert * mail/rmailmm.el (rmail-mime-toggle-raw): Do rmail-mime-insert

4
lisp/comint.el
View File

@ -3161,8 +3161,8 @@ See `completion-table-with-quoting' and `comint-unquote-function'.")
(complete-with-action action table string pred)))) (complete-with-action action table string pred))))
(unless (zerop (length filesuffix)) (unless (zerop (length filesuffix))
(list :exit-function (list :exit-function
(lambda (_s finished) (lambda (_s status)
(when (memq finished '(sole finished)) (when (eq status 'finished)
(if (looking-at (regexp-quote filesuffix)) (if (looking-at (regexp-quote filesuffix))
(goto-char (match-end 0)) (goto-char (match-end 0))
(insert filesuffix))))))))) (insert filesuffix)))))))))

7
lisp/pcomplete.el
View File

@ -451,9 +451,12 @@ Same as `pcomplete' but using the standard completion UI."
(list beg (point) table (list beg (point) table
:predicate pred :predicate pred
:exit-function :exit-function
;; If completion is finished, add a terminating space.
;; We used to also do this if STATUS is `sole', but
;; that does not work right when completion cycling.
(unless (zerop (length pcomplete-termination-string)) (unless (zerop (length pcomplete-termination-string))
(lambda (_s finished) (lambda (_s status)
(when (memq finished '(sole finished)) (when (eq status 'finished)
(if (looking-at (if (looking-at
(regexp-quote pcomplete-termination-string)) (regexp-quote pcomplete-termination-string))
(goto-char (match-end 0)) (goto-char (match-end 0))