aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorLeo Liu2013-05-17 10:43:41 +0800
committerLeo Liu2013-05-17 10:43:41 +0800
commitc7a8fcacf99548e19b4efcf6900abc66c1de3a9d (patch)
tree64b94a2652784a8e938b7e8013df6d72d3a4a3cf /lisp/progmodes
parentf678b18a19e3c8050acfde90523b1542e4537053 (diff)
downloademacs-c7a8fcacf99548e19b4efcf6900abc66c1de3a9d.tar.gz
emacs-c7a8fcacf99548e19b4efcf6900abc66c1de3a9d.zip
* subr.el (delete-consecutive-dups): New function.
* ido.el (ido-set-matches-1): Use it. * progmodes/octave.el (inferior-octave-completion-table): Use it. * ido.el (ido-remove-consecutive-dups): Remove.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/octave.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index ab2f570cccb..451ac2791a7 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -38,7 +38,9 @@
38(require 'newcomment) 38(require 'newcomment)
39(eval-and-compile 39(eval-and-compile
40 (unless (fboundp 'user-error) 40 (unless (fboundp 'user-error)
41 (defalias 'user-error 'error))) 41 (defalias 'user-error 'error))
42 (unless (fboundp 'delete-consecutive-dups)
43 (defalias 'delete-consecutive-dups 'delete-dups)))
42(eval-when-compile 44(eval-when-compile
43 (unless (fboundp 'setq-local) 45 (unless (fboundp 'setq-local)
44 (defmacro setq-local (var val) 46 (defmacro setq-local (var val)
@@ -777,8 +779,8 @@ startup file, `~/.emacs-octave'."
777 (inferior-octave-send-list-and-digest 779 (inferior-octave-send-list-and-digest
778 (list (concat "completion_matches (\"" command "\");\n"))) 780 (list (concat "completion_matches (\"" command "\");\n")))
779 (setq cache (list command (float-time) 781 (setq cache (list command (float-time)
780 (sort (delete-dups inferior-octave-output-list) 782 (delete-consecutive-dups
781 'string-lessp)))) 783 (sort inferior-octave-output-list 'string-lessp)))))
782 (car (cddr cache)))))) 784 (car (cddr cache))))))
783 785
784(defun inferior-octave-completion-at-point () 786(defun inferior-octave-completion-at-point ()