aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRĂ¼diger Sonderfeld2013-04-30 23:20:46 +0800
committerLeo Liu2013-04-30 23:20:46 +0800
commit5147fc177367a3d41a98bc651b02af3660aeafbd (patch)
tree00e875d75bae07c106f58d3a6620b34fbb274296
parent5b78d7fcc7edaacffda6011469f3e8cf66608be6 (diff)
downloademacs-5147fc177367a3d41a98bc651b02af3660aeafbd.tar.gz
emacs-5147fc177367a3d41a98bc651b02af3660aeafbd.zip
* progmodes/octave.el (inferior-octave-prompt-read-only): New user
variable.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/octave.el10
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ff660592b7..00cfe320701 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-04-30 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
2
3 * progmodes/octave.el (inferior-octave-prompt-read-only): New user
4 variable.
5
12013-04-30 Leo Liu <sdl.web@gmail.com> 62013-04-30 Leo Liu <sdl.web@gmail.com>
2 7
3 * progmodes/octave.el (octave-variables): Remove. No builtin 8 * progmodes/octave.el (octave-variables): Remove. No builtin
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 6913d70550f..32d265d2e80 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -568,6 +568,15 @@ definitions can also be stored in files and used in batch mode."
568 :type 'regexp 568 :type 'regexp
569 :group 'octave) 569 :group 'octave)
570 570
571(defcustom inferior-octave-prompt-read-only t
572 "If non-nil, the Octave prompt is read only.
573The read only region includes the newline before the prompt.
574Setting this variable does not affect existing Octave runs.
575This feature utilizes the `comint-prompt-read-only' variable."
576 :type 'boolean
577 :group 'octave
578 :version "24.4")
579
571(defcustom inferior-octave-startup-file nil 580(defcustom inferior-octave-startup-file nil
572 "Name of the inferior Octave startup file. 581 "Name of the inferior Octave startup file.
573The contents of this file are sent to the inferior Octave process on 582The contents of this file are sent to the inferior Octave process on
@@ -661,6 +670,7 @@ in the Inferior Octave buffer.")
661 comint-input-ring-size (or (getenv "OCTAVE_HISTSIZE") 1024)) 670 comint-input-ring-size (or (getenv "OCTAVE_HISTSIZE") 1024))
662 (setq-local comint-dynamic-complete-functions 671 (setq-local comint-dynamic-complete-functions
663 inferior-octave-dynamic-complete-functions) 672 inferior-octave-dynamic-complete-functions)
673 (setq-local comint-prompt-read-only inferior-octave-prompt-read-only)
664 (add-hook 'comint-input-filter-functions 674 (add-hook 'comint-input-filter-functions
665 'inferior-octave-directory-tracker nil t) 675 'inferior-octave-directory-tracker nil t)
666 (comint-read-input-ring t)) 676 (comint-read-input-ring t))