[Emacs-diffs] /srv/bzr/emacs/trunk r104507: * lisp/comint.el (comint-dynamic-complete-as-filename)

[Andreas Schwab]

------------------------------------------------------------
revno: 104507
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-06-06 01:20:16 +0200
message:
  * lisp/comint.el (comint-dynamic-complete-as-filename)
  (comint-dynamic-complete-filename): Correctly call
  completion-in-region.
modified:
  lisp/ChangeLog
  lisp/comint.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-05 19:39:17 +0000
+++ b/lisp/ChangeLog    2011-06-05 23:20:16 +0000
@@ -1,3 +1,9 @@
+2011-06-05  Andreas Schwab  <address@hidden>
+
+       * comint.el (comint-dynamic-complete-as-filename)
+       (comint-dynamic-complete-filename): Correctly call
+       completion-in-region.
+
 2011-06-05  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-prompt-for-encryption): Fix bug introduced

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2011-05-24 02:45:50 +0000
+++ b/lisp/comint.el    2011-06-05 23:20:16 +0000
@@ -3035,7 +3035,8 @@
   (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 @@
 (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")