Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / progmodes / octave-inf.el

diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 803a542..40469b7 100644 (file)
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -1,10 +1,10 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
 
-;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
 ;; Author: John Eaton <jwe@bevo.che.wisc.edu>
-;; Maintainer: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
+;; Maintainer: FSF
 ;; Keywords: languages
 ;; Package: octave-mod
 
@@ -68,7 +68,8 @@ mode, set this to (\"-q\" \"--traditional\")."
     (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring)
     (define-key map [menu-bar inout list-history]
       '("List Input History" . inferior-octave-dynamic-list-input-ring))
-    (define-key map "\C-c\C-h" 'octave-help)
+    ;; FIXME: free C-h so it can do the describe-prefix-bindings.
+    (define-key map "\C-c\C-h" 'info-lookup-symbol)
     map)
   "Keymap used in Inferior Octave mode.")
 
@@ -267,8 +268,12 @@ startup file, `~/.emacs-octave'."
          (save-excursion
            (skip-syntax-backward "w_" (comint-line-beginning-position))
             (point))))
-    (cond (inferior-octave-complete-impossible nil)
-         ((eq start end) nil)
+    (cond ((eq start end) nil)
+         (inferior-octave-complete-impossible
+           (message (concat
+                     "Your Octave does not have `completion_matches'.  "
+                     "Please upgrade to version 2.X."))
+           nil)
          (t
            (list
             start end
@@ -279,19 +284,8 @@ startup file, `~/.emacs-octave'."
                (sort (delete-dups inferior-octave-output-list)
                      'string-lessp))))))))
 
-(defun inferior-octave-complete ()
-  "Perform completion on the Octave symbol preceding point.
-This is implemented using the Octave command `completion_matches' which
-is NOT available with versions of Octave prior to 2.0."
-  (interactive)
-  (if inferior-octave-complete-impossible
-      (error (concat
-              "Your Octave does not have `completion_matches'.  "
-              "Please upgrade to version 2.X."))
-    (let ((data (inferior-octave-completion-at-point)))
-      (if (null data)
-          (message "Cannot complete an empty string")
-        (apply #'completion-in-region data)))))
+(define-obsolete-function-alias 'inferior-octave-complete
+  'completion-at-point "24.1")
 
 (defun inferior-octave-dynamic-list-input-ring ()
   "List the buffer's input history in a help buffer."