[Emacs-diffs] emacs/lisp ChangeLog progmodes/octave-mod.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/03 02:58:20

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : octave-mod.el 

Log message:
        (octave-complete-symbol): Use completion-in-region.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16803&r2=1.16804
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/octave-mod.el?cvsroot=emacs&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16803
retrieving revision 1.16804
diff -u -b -r1.16803 -r1.16804
--- ChangeLog   3 Dec 2009 02:57:16 -0000       1.16803
+++ ChangeLog   3 Dec 2009 02:58:16 -0000       1.16804
@@ -1,5 +1,8 @@
 2009-12-03  Stefan Monnier  <address@hidden>
 
+       * progmodes/octave-mod.el (octave-complete-symbol):
+       Use completion-in-region.
+
        Misc cleanup.
        * progmodes/idlwave.el (idlwave-comment-hook): Simplify with `or'.
        (idlwave-code-abbrev, idlwave-display-user-catalog-widget)

Index: progmodes/octave-mod.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/octave-mod.el,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- progmodes/octave-mod.el     24 Oct 2009 03:48:40 -0000      1.51
+++ progmodes/octave-mod.el     3 Dec 2009 02:58:20 -0000       1.52
@@ -1237,45 +1237,10 @@
   "Perform completion on Octave symbol preceding point.
 Compare that symbol against Octave's reserved words and builtin
 variables."
-  ;; This code taken from lisp-complete-symbol
   (interactive)
   (let* ((end (point))
-        (beg (save-excursion (backward-sexp 1) (point)))
-        (string (buffer-substring-no-properties beg end))
-        (completion (try-completion string octave-completion-alist)))
-    (cond ((eq completion t))          ; ???
-         ((null completion)
-          (message "Can't find completion for \"%s\"" string)
-          (ding))
-         ((not (string= string completion))
-           (delete-region beg end)
-           (insert completion))
-         (t
-          (let ((list (all-completions string octave-completion-alist))
-                (conf (current-window-configuration)))
-            ;; Taken from comint.el
-            (message "Making completion list...")
-            (with-output-to-temp-buffer "*Completions*"
-              (display-completion-list list string))
-            (message "Hit space to flush")
-            (let (key first)
-              (if (with-current-buffer (get-buffer "*Completions*")
-                    (setq key (read-key-sequence nil)
-                          first (aref key 0))
-                    (and (consp first) (consp (event-start first))
-                         (eq (window-buffer (posn-window (event-start
-                                                          first)))
-                             (get-buffer "*Completions*"))
-                         (eq (key-binding key) 'mouse-choose-completion)))
-                  (progn
-                    (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)
-                  (setq unread-command-events
-                        (listify-key-sequence key))))))))))
+        (beg (save-excursion (backward-sexp 1) (point))))
+    (completion-in-region beg end octave-completion-alist)))
 
 
 ;;; Electric characters && friends