From e71564921ec760638105c910fdfae8b648724130 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 6 Jun 2011 01:20:16 +0200 Subject: [PATCH] * lisp/comint.el (comint-dynamic-complete-as-filename) (comint-dynamic-complete-filename): Correctly call completion-in-region. --- lisp/ChangeLog | 6 ++++++ lisp/comint.el | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a98aa1ba52d..e11149f1689 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-06-05 Andreas Schwab + + * comint.el (comint-dynamic-complete-as-filename) + (comint-dynamic-complete-filename): Correctly call + completion-in-region. + 2011-06-05 Deniz Dogan * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced diff --git a/lisp/comint.el b/lisp/comint.el index e4bc530f361..5548d19ad30 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3035,7 +3035,8 @@ Returns t if successful." (when (comint--match-partial-filename) (unless (window-minibuffer-p (selected-window)) (message "Completing file name...")) - (apply #'completion-in-region (comint--complete-file-name-data)))) + (let ((data (comint--complete-file-name-data))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data))))) (defun comint-filename-completion () "Return completion data for filename at point, if any." @@ -3152,7 +3153,8 @@ in the same way as TABLE completes strings of the form (concat S2 S)." (defun comint-dynamic-complete-as-filename () "Dynamically complete at point as a filename. See `comint-dynamic-complete-filename'. Returns t if successful." - (apply #'completion-in-region (comint--complete-file-name-data))) + (let ((data (comint--complete-file-name-data))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)))) (make-obsolete 'comint-dynamic-complete-as-filename 'comint-filename-completion "24.1") -- 2.11.4.GIT