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

mouse-choose-completion is ever removed.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d96feb4c222..3ed4e083527 100644
--- 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 6f5a69f890a..0671dbe807a 100644
--- 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)