* lisp/comint.el (comint-dynamic-complete-as-filename)

(comint-dynamic-complete-filename): Correctly call
completion-in-region.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a98aa1ba52d1479f20da72a6e564cbf9c2dff012..e11149f16893fad2e759864d4a2663320d30aa48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * comint.el (comint-dynamic-complete-as-filename)
+       (comint-dynamic-complete-filename): Correctly call
+       completion-in-region.
+
 2011-06-05  Deniz Dogan  <deniz@dogan.se>
 
        * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced

diff --git a/lisp/comint.el b/lisp/comint.el
index e4bc530f36138bcde72ae71bcdd1c038aa8d090a..5548d19ad3058356a92787648d0a1590642c15eb 100644 (file)
--- 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")