aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorRüdiger Sonderfeld2013-12-11 14:50:46 +0100
committerRüdiger Sonderfeld2013-12-11 14:50:46 +0100
commited4bc201f5015aa6c4c901eca9e33036e21fdb65 (patch)
tree2c45987099b0580791dd0d4b2379ef515275049e /lisp
parentd94c40c1b74bcd10795fa6ea9cc1a8908486b093 (diff)
downloademacs-ed4bc201f5015aa6c4c901eca9e33036e21fdb65.tar.gz
emacs-ed4bc201f5015aa6c4c901eca9e33036e21fdb65.zip
Import `octave-mode' manual from GNU Octave.
The manual was written by Kurt Hornik. He agreed to assign the copyright for it to the FSF. I have updated and modified the manual. * doc/misc/octave-mode.texi: Imported from GNU Octave (doc/interpreter/emacs.txi). * doc/misc/Makefile.in: Add octave-mode.texi. * lisp/progmodes/octave.el (octave-mode, inferior-octave-mode): Link to info manual and show keybindings and set `:group' keyword.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/octave.el18
2 files changed, 21 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 186d6e154aa..4eb5b5e8e18 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-11 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
2
3 * progmodes/octave.el (octave-mode, inferior-octave-mode): Link to
4 info manual and show keybindings and set `:group' keyword.
5
12013-12-11 Juri Linkov <juri@jurta.org> 62013-12-11 Juri Linkov <juri@jurta.org>
2 7
3 * delsel.el (delete-active-region): Let-bind `this-command' 8 * delsel.el (delete-active-region): Let-bind `this-command'
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 778659c0de4..d551d0ddb57 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -528,8 +528,14 @@ Non-nil means always go to the next Octave code line after sending."
528Octave is a high-level language, primarily intended for numerical 528Octave is a high-level language, primarily intended for numerical
529computations. It provides a convenient command line interface 529computations. It provides a convenient command line interface
530for solving linear and nonlinear problems numerically. Function 530for solving linear and nonlinear problems numerically. Function
531definitions can also be stored in files and used in batch mode." 531definitions can also be stored in files and used in batch mode.
532
533See Info node `(octave-mode) Using Octave Mode' for more details.
534
535Key bindings:
536\\{octave-mode-map}"
532 :abbrev-table octave-abbrev-table 537 :abbrev-table octave-abbrev-table
538 :group 'octave
533 539
534 (smie-setup octave-smie-grammar #'octave-smie-rules 540 (smie-setup octave-smie-grammar #'octave-smie-rules
535 :forward-token #'octave-smie-forward-token 541 :forward-token #'octave-smie-forward-token
@@ -705,8 +711,16 @@ in the Inferior Octave buffer.")
705 (process-live-p inferior-octave-process)) 711 (process-live-p inferior-octave-process))
706 712
707(define-derived-mode inferior-octave-mode comint-mode "Inferior Octave" 713(define-derived-mode inferior-octave-mode comint-mode "Inferior Octave"
708 "Major mode for interacting with an inferior Octave process." 714 "Major mode for interacting with an inferior Octave process.
715
716See Info node `(octave-mode) Running Octave from Within Emacs' for more
717details.
718
719Key bindings:
720\\{inferior-octave-mode-map}"
709 :abbrev-table octave-abbrev-table 721 :abbrev-table octave-abbrev-table
722 :group 'octave
723
710 (setq comint-prompt-regexp inferior-octave-prompt) 724 (setq comint-prompt-regexp inferior-octave-prompt)
711 725
712 (setq-local comment-use-syntax t) 726 (setq-local comment-use-syntax t)