2 files changed, 4 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d90caded308..a2719a2ebf4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,7 @@
         (octave-help-file, octave-help-function): New button types.
         (octave-help): New command and bind it to C-h ;.
         (octave-find-definition): New command and bind it to M-.
+        (user-error): Alias to error if not defined.
 
 2013-05-02  Leo Liu  <sdl.web@gmail.com>
 
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 3fe84030003..10f6007204b 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -36,6 +36,9 @@
 
 ;;; For emacs < 24.3.
 (require 'newcomment)
+(eval-and-compile
+  (unless (fboundp 'user-error)
+    (defalias 'user-error 'error)))
 (eval-when-compile
   (unless (fboundp 'setq-local)
     (defmacro setq-local (var val)