summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/octave.el6
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0513d69d0fc..3b1796a6421 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-30 Leo Liu <sdl.web@gmail.com>
+
+ * progmodes/octave.el (inferior-octave-prompt-read-only): Fix last
+ change.
+
2013-04-30 Alan Mackenzie <acm@muc.de>
Handle arbitrarily long C++ member initialisation lists.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 32d265d2e80..22ecd514c5c 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -568,11 +568,9 @@ definitions can also be stored in files and used in batch mode."
:type 'regexp
:group 'octave)
-(defcustom inferior-octave-prompt-read-only t
+(defcustom inferior-octave-prompt-read-only comint-prompt-read-only
"If non-nil, the Octave prompt is read only.
-The read only region includes the newline before the prompt.
-Setting this variable does not affect existing Octave runs.
-This feature utilizes the `comint-prompt-read-only' variable."
+See `comint-prompt-read-only' for details."
:type 'boolean
:group 'octave
:version "24.4")