(octave-complete-symbol): Use choose-completion if

mouse-choose-completion is ever removed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d96feb4c22280ae97bf0768ffdb889c59db8c964..3ed4e0835276c982bd4bd89fabe87e96f4cafb75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-24  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/octave-mod.el (octave-complete-symbol): Use
+       choose-completion if mouse-choose-completion is ever removed.
+
        * textmodes/sgml-mode.el (sgml-looking-back-at): Move definition before
        use.
 

diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 6f5a69f890a6083127b4d022900194e1984a697a..0671dbe807ab4a0a26ed332e3725b74d2e6f4624 100644 (file)
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1268,7 +1268,9 @@ variables."
                              (get-buffer "*Completions*"))
                          (eq (key-binding key) 'mouse-choose-completion)))
                   (progn
-                    (mouse-choose-completion first)
+                    (if (fboundp 'mouse-choose-completion)
+                        (mouse-choose-completion first)
+                      (choose-completion first)) ; Emacs >= 23.2
                     (set-window-configuration conf))
                 (if (eq first ?\ )
                     (set-window-configuration conf)