*** empty log message ***

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

diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 30bb304..6f5a69f 100644 (file)
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1,6 +1,6 @@
 ;;; octave-mod.el --- editing Octave source files under Emacs
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
@@ -238,27 +238,27 @@ parenthetical grouping.")
 
 (defvar octave-mode-menu
   '("Octave"
-    '("Lines"
+    ("Lines"
       ["Previous Code Line"    octave-previous-code-line t]
       ["Next Code Line"                octave-next-code-line t]
       ["Begin of Continuation" octave-beginning-of-line t]
       ["End of Continuation"   octave-end-of-line t]
       ["Split Line at Point"   octave-indent-new-comment-line t])
-    '("Blocks"
+    ("Blocks"
       ["Next Block"            octave-forward-block t]
       ["Previous Block"                octave-backward-block t]
       ["Down Block"            octave-down-block t]
       ["Up Block"              octave-backward-up-block t]
       ["Mark Block"            octave-mark-block t]
       ["Close Block"           octave-close-block t])
-    '("Functions"
+    ("Functions"
       ["Begin of Function"     octave-beginning-of-defun t]
       ["End of Function"       octave-end-of-defun t]
       ["Mark Function"         octave-mark-defun t]
       ["Indent Function"       octave-indent-defun t]
       ["Insert Function"       octave-insert-defun t])
     "-"
-    '("Debug"
+    ("Debug"
       ["Send Current Line"     octave-send-line t]
       ["Send Current Block"    octave-send-block t]
       ["Send Current Function" octave-send-defun t]
@@ -1312,7 +1312,7 @@ Insert a newline if `octave-auto-newline' is non-nil."
 Maybe expand abbrevs and blink matching block open keywords.
 Reindent the line of `octave-auto-indent' is non-nil."
   (interactive)
-  (setq last-command-char ? )
+  (setq last-command-event ? )
   (if (and octave-auto-indent
           (not (octave-not-in-string-or-comment-p)))
       (progn
@@ -1338,7 +1338,7 @@ Note that all Octave mode abbrevs start with a grave accent."
   (if (not abbrev-mode)
       (self-insert-command 1)
     (let (c)
-      (insert last-command-char)
+      (insert last-command-event)
       (if (if (featurep 'xemacs)
              (or (eq (event-to-character (setq c (next-event))) ??)
                  (eq (event-to-character c) help-char))