master 1db4607: * lisp/textmodes/two-column.el: Address FIXME

[Stefan Monnier]

branch: master
commit 1db460784e90b7c78c5d541640a4d520f9b406b1
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * lisp/textmodes/two-column.el: Address FIXME
    
    (2C-associate-buffer): Move minibuffer interactive to the `interactive` 
spec.
---
 lisp/textmodes/two-column.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 6c3bacc..5a3a64a 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -319,16 +319,17 @@ first and the associated buffer to its right."
 
 
 ;;;###autoload
-(defun 2C-associate-buffer ()
-  "Associate another buffer with this one in two-column minor mode.
+(defun 2C-associate-buffer (buffer)
+  "Associate another BUFFER with this one in two-column minor mode.
 Can also be used to associate a just previously visited file, by
 accepting the proposed default buffer.
 
 \(See  \\[describe-mode] .)"
-  (interactive)
+  (interactive
+   (list (or (2C-other)
+            (read-buffer "Associate buffer: " (other-buffer)))))
   (let ((b1 (current-buffer))
-       (b2 (or (2C-other)
-               (read-buffer "Associate buffer: " (other-buffer)))))
+       (b2 buffer))
     (setq 2C-mode nil)
     (with-current-buffer b2
       (and (2C-other)