annotate lisp/progmodes/octave-mod.el @ 111440:b72ff43b041f

* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values. (smie-precs->prec2): Rename from smie-precs-precedence-table. (smie-bnf->prec2): Rename from smie-bnf-precedence-table. (smie-prec2->grammar): Rename from smie-prec2-levels. (smie-grammar): Rename from smie-op-levels. (smie-indent--hanging-p): Rename from smie-hanging-p. (smie-rule-hanging-p): New alias. (smie-indent--bolp): Rename from smie-bolp. (smie-indent--hanging-p): New alias. (smie--token): New dynamically bound variable. (smie-indent--parent): New function. (smie-rule-parent-p): Use it; rename from smie-parent-p. (smie-rule-next-p): Rename from smie-next-p. (smie-rule-prev-p): Rename from smie-prev-p. (smie-rule-sibling-p, smie-rule-parent) (smie-indent--separator-outdent, smie-rule-separator): New functions. (smie-rule-separator-outdent): New var. (smie-indent--rule): Merge with smie-indent--column. (smie-indent-forward-token, smie-indent-backward-token): Also recognize close parens. (smie-indent-keyword): Don't use smie-indent--column any more. (smie-indent-after-keyword): Ignore closers by default. (smie-indent-line): Use with-demoted-errors. * lisp/progmodes/octave-mod.el (octave-smie-grammar): Rename from octave-smie-op-levels. (octave-smie-rules): Adjust to new behavior. * lisp/progmodes/prolog.el (prolog-smie-grammar): Rename from prolog-smie-op-levels.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 07 Nov 2010 10:45:45 -0500
parents a9904c1962db
children 66c9a8999fbb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17517
8f952e921136 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17151
diff changeset
1 ;;; octave-mod.el --- editing Octave source files under Emacs
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106716
diff changeset
3 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
64699
629afbe74e61 Update copyright for release of 22.1 for progmodes directory.
Nick Roberts <nickrob@snap.net.nz>
parents: 64085
diff changeset
4 ;; Free Software Foundation, Inc.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
65151
7ab3eb3e09b8 Change Author and Maintainer address.
Eli Zaretskii <eliz@gnu.org>
parents: 64699
diff changeset
6 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
7 ;; Author: John Eaton <jwe@octave.org>
65151
7ab3eb3e09b8 Change Author and Maintainer address.
Eli Zaretskii <eliz@gnu.org>
parents: 64699
diff changeset
8 ;; Maintainer: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9 ;; Keywords: languages
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94565
diff changeset
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94565
diff changeset
15 ;; the Free Software Foundation, either version 3 of the License, or
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94565
diff changeset
16 ;; (at your option) any later version.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; GNU General Public License for more details.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94565
diff changeset
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 ;;; Commentary:
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
28 ;; This package provides Emacs support for Octave.
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
29 ;; It defines Octave mode, a major mode for editing
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
30 ;; Octave code.
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
31
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
32 ;; The file octave-inf.el contains code for interacting with an inferior
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
33 ;; Octave process using comint.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34
94496
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
35 ;; See the documentation of `octave-mode' and
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
36 ;; `run-octave' for further information on usage and customization.
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
37
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
38 ;;; Code:
26157
313a03652df3 Added (require 'custom) and deleted :version line from
Stephen Eglen <stephen@gnu.org>
parents: 25277
diff changeset
39 (require 'custom)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
41 (defgroup octave nil
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
42 "Major mode for editing Octave source files."
66963
a11fdee52c05 Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents: 66114
diff changeset
43 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
44 :group 'languages)
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
45
17533
997e9c9b618b (inferior-octave-output-list): Declare here
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
46 (defvar inferior-octave-output-list nil)
997e9c9b618b (inferior-octave-output-list): Declare here
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
47 (defvar inferior-octave-output-string nil)
997e9c9b618b (inferior-octave-output-list): Declare here
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
48 (defvar inferior-octave-receive-in-progress nil)
997e9c9b618b (inferior-octave-output-list): Declare here
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
49
86234
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85511
diff changeset
50 (declare-function inferior-octave-send-list-and-digest "octave-inf" (list))
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85511
diff changeset
51
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
52 (defconst octave-maintainer-address
65151
7ab3eb3e09b8 Change Author and Maintainer address.
Eli Zaretskii <eliz@gnu.org>
parents: 64699
diff changeset
53 "Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>, bug-gnu-emacs@gnu.org"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
54 "Current maintainer of the Emacs Octave package.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
55
94565
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
56 (define-abbrev-table 'octave-abbrev-table
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
57 (mapcar (lambda (e) (append e '(nil 0 t)))
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
58 '(("`a" "all_va_args")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
59 ("`b" "break")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
60 ("`cs" "case")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
61 ("`ca" "catch")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
62 ("`c" "continue")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
63 ("`el" "else")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
64 ("`eli" "elseif")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
65 ("`et" "end_try_catch")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
66 ("`eu" "end_unwind_protect")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
67 ("`ef" "endfor")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
68 ("`efu" "endfunction")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
69 ("`ei" "endif")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
70 ("`es" "endswitch")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
71 ("`ew" "endwhile")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
72 ("`f" "for")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
73 ("`fu" "function")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
74 ("`gl" "global")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
75 ("`gp" "gplot")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
76 ("`gs" "gsplot")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
77 ("`if" "if ()")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
78 ("`o" "otherwise")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
79 ("`rp" "replot")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
80 ("`r" "return")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
81 ("`s" "switch")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
82 ("`t" "try")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
83 ("`u" "until ()")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
84 ("`up" "unwind_protect")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
85 ("`upc" "unwind_protect_cleanup")
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
86 ("`w" "while ()")))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
87 "Abbrev table for Octave's reserved words.
42445
3dbc8d04a492 (octave-abbrev-table): Mark all the predefined abbrevs as "system" abbrevs.
Pavel Janík <Pavel@Janik.cz>
parents: 42205
diff changeset
88 Used in `octave-mode' and inferior-octave-mode buffers.
94565
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
89 All Octave abbrevs start with a grave accent (`)."
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
90 :regexp "\\(?:[^`]\\|^\\)\\(\\(?:\\<\\|`\\)\\w+\\)\\W*")
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
91
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
92 (defvar octave-comment-char ?#
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
93 "Character to start an Octave comment.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
94 (defvar octave-comment-start
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
95 (string octave-comment-char ?\s)
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
96 "String to insert to start a new Octave in-line comment.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
97 (defvar octave-comment-start-skip "\\s<+\\s-*"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
98 "Regexp to match the start of an Octave comment up to its body.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
99
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
100 (defvar octave-begin-keywords
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
101 '("do" "for" "function" "if" "switch" "try" "unwind_protect" "while"))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
102 (defvar octave-else-keywords
17151
0663a5ce936c (octave-abbrev-table): Add abbrevs for switch,
Karl Heuer <kwzh@gnu.org>
parents: 16911
diff changeset
103 '("case" "catch" "else" "elseif" "otherwise" "unwind_protect_cleanup"))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
104 (defvar octave-end-keywords
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
105 '("endfor" "endfunction" "endif" "endswitch" "end_try_catch"
106716
4039413a8b1d Allow use of "end" keyword for terminating Octave-mode blocks.
Chong Yidong <cyd@stupidchicken.com>
parents: 106697
diff changeset
106 "end_unwind_protect" "endwhile" "until" "end"))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
107
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
108 (defvar octave-reserved-words
17151
0663a5ce936c (octave-abbrev-table): Add abbrevs for switch,
Karl Heuer <kwzh@gnu.org>
parents: 16911
diff changeset
109 (append octave-begin-keywords
0663a5ce936c (octave-abbrev-table): Add abbrevs for switch,
Karl Heuer <kwzh@gnu.org>
parents: 16911
diff changeset
110 octave-else-keywords
0663a5ce936c (octave-abbrev-table): Add abbrevs for switch,
Karl Heuer <kwzh@gnu.org>
parents: 16911
diff changeset
111 octave-end-keywords
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
112 '("break" "continue" "end" "global" "persistent" "return"))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
113 "Reserved words in Octave.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
114
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
115 (defvar octave-text-functions
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
116 '("casesen" "cd" "chdir" "clear" "diary" "dir" "document" "echo"
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
117 "edit_history" "format" "help" "history" "hold"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
118 "load" "ls" "more" "run_history" "save" "type"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
119 "which" "who" "whos")
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
120 "Text functions in Octave.")
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
121
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
122 (defvar octave-variables
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
123 '("DEFAULT_EXEC_PATH" "DEFAULT_LOADPATH"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
124 "EDITOR" "EXEC_PATH" "F_DUPFD" "F_GETFD" "F_GETFL" "F_SETFD"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
125 "F_SETFL" "I" "IMAGE_PATH" "Inf" "J"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
126 "NaN" "OCTAVE_VERSION" "O_APPEND" "O_CREAT" "O_EXCL"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
127 "O_NONBLOCK" "O_RDONLY" "O_RDWR" "O_TRUNC" "O_WRONLY" "PAGER" "PS1"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
128 "PS2" "PS4" "PWD" "SEEK_CUR" "SEEK_END" "SEEK_SET" "__F_DUPFD__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
129 "__F_GETFD__" "__F_GETFL__" "__F_SETFD__" "__F_SETFL__" "__I__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
130 "__Inf__" "__J__" "__NaN__" "__OCTAVE_VERSION__" "__O_APPEND__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
131 "__O_CREAT__" "__O_EXCL__" "__O_NONBLOCK__" "__O_RDONLY__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
132 "__O_RDWR__" "__O_TRUNC__" "__O_WRONLY__" "__PWD__" "__SEEK_CUR__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
133 "__SEEK_END__" "__SEEK_SET__" "__argv__" "__e__" "__eps__"
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
134 "__i__" "__inf__" "__j__" "__nan__" "__pi__"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
135 "__program_invocation_name__" "__program_name__" "__realmax__"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
136 "__realmin__" "__stderr__" "__stdin__" "__stdout__" "ans" "argv"
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
137 "beep_on_error" "completion_append_char"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
138 "crash_dumps_octave_core" "default_save_format"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
139 "e" "echo_executing_commands" "eps"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
140 "error_text" "gnuplot_binary" "history_file"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
141 "history_size" "ignore_function_time_stamp"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
142 "inf" "nan" "nargin" "output_max_field_width" "output_precision"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
143 "page_output_immediately" "page_screen_output" "pi"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
144 "print_answer_id_name" "print_empty_dimensions"
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
145 "program_invocation_name" "program_name"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
146 "realmax" "realmin" "return_last_computed_value" "save_precision"
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
147 "saving_history" "sighup_dumps_octave_core" "sigterm_dumps_octave_core"
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
148 "silent_functions" "split_long_rows" "stderr" "stdin" "stdout"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
149 "string_fill_char" "struct_levels_to_print"
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
150 "suppress_verbose_help_message")
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
151 "Builtin variables in Octave.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
152
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
153 (defvar octave-function-header-regexp
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
154 (concat "^\\s-*\\<\\(function\\)\\>"
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
155 "\\([^=;\n]*=[ \t]*\\|[ \t]*\\)\\(\\w+\\)\\>")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
156 "Regexp to match an Octave function header.
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
157 The string `function' and its name are given by the first and third
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
158 parenthetical grouping.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
159
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
160 (defvar octave-font-lock-keywords
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
161 (list
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
162 ;; Fontify all builtin keywords.
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
163 (cons (concat "\\<\\("
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
164 (regexp-opt (append octave-reserved-words
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
165 octave-text-functions))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
166 "\\)\\>")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
167 'font-lock-keyword-face)
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
168 ;; Fontify all builtin operators.
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
169 (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)"
28070
7079931424be (octave-font-lock-keywords): To font-lock the
Gerd Moellmann <gerd@gnu.org>
parents: 26157
diff changeset
170 (if (boundp 'font-lock-builtin-face)
7079931424be (octave-font-lock-keywords): To font-lock the
Gerd Moellmann <gerd@gnu.org>
parents: 26157
diff changeset
171 'font-lock-builtin-face
7079931424be (octave-font-lock-keywords): To font-lock the
Gerd Moellmann <gerd@gnu.org>
parents: 26157
diff changeset
172 'font-lock-preprocessor-face))
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
173 ;; Fontify all builtin variables.
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
174 (cons (concat "\\<" (regexp-opt octave-variables) "\\>")
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
175 'font-lock-variable-name-face)
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
176 ;; Fontify all function declarations.
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
177 (list octave-function-header-regexp
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
178 '(1 font-lock-keyword-face)
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
179 '(3 font-lock-function-name-face nil t)))
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
180 "Additional Octave expressions to highlight.")
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
181
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
182 (defun octave-syntax-propertize-function (start end)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
183 (goto-char start)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
184 (octave-syntax-propertize-sqs end)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
185 (funcall (syntax-propertize-rules
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
186 ;; Try to distinguish the string-quotes from the transpose-quotes.
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
187 ("[[({,; ]\\('\\)"
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
188 (1 (prog1 "\"'" (octave-syntax-propertize-sqs end)))))
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
189 (point) end))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
190
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
191 (defun octave-syntax-propertize-sqs (end)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
192 "Propertize the content/end of single-quote strings."
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
193 (when (eq (nth 3 (syntax-ppss)) ?\')
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
194 ;; A '..' string.
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
195 (when (re-search-forward
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
196 "\\(?:\\=\\|[^']\\)\\(?:''\\)*\\('\\)\\($\\|[^']\\)" end 'move)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
197 (goto-char (match-beginning 2))
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
198 (when (eq (char-before (match-beginning 1)) ?\\)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
199 ;; Backslash cannot escape a single quote.
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
200 (put-text-property (1- (match-beginning 1)) (match-beginning 1)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
201 'syntax-table (string-to-syntax ".")))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
202 (put-text-property (match-beginning 1) (match-end 1)
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
203 'syntax-table (string-to-syntax "\"'")))))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
204
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
205 (defcustom inferior-octave-buffer "*Inferior Octave*"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
206 "Name of buffer for running an inferior Octave process."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
207 :type 'string
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
208 :group 'octave-inferior)
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
209
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
210 (defvar inferior-octave-process nil)
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
211
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
212 (defvar octave-mode-map
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
213 (let ((map (make-sparse-keymap)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
214 (define-key map "`" 'octave-abbrev-start)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
215 (define-key map ";" 'octave-electric-semi)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
216 (define-key map " " 'octave-electric-space)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
217 (define-key map "\n" 'octave-reindent-then-newline-and-indent)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
218 (define-key map "\e\n" 'octave-indent-new-comment-line)
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
219 (define-key map "\M-\C-q" 'octave-indent-defun)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
220 (define-key map "\C-c\C-b" 'octave-submit-bug-report)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
221 (define-key map "\C-c\C-p" 'octave-previous-code-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
222 (define-key map "\C-c\C-n" 'octave-next-code-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
223 (define-key map "\C-c\C-a" 'octave-beginning-of-line)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
224 (define-key map "\C-c\C-e" 'octave-end-of-line)
110066
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
225 (define-key map [remap down-list] 'smie-down-list)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
226 (define-key map "\C-c\M-\C-h" 'octave-mark-block)
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
227 (define-key map "\C-c]" 'smie-close-block)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
228 (define-key map "\C-c/" 'smie-close-block)
49334
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
229 (define-key map "\C-c\C-f" 'octave-insert-defun)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
230 (define-key map "\C-c\C-h" 'octave-help)
49334
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
231 (define-key map "\C-c\C-il" 'octave-send-line)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
232 (define-key map "\C-c\C-ib" 'octave-send-block)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
233 (define-key map "\C-c\C-if" 'octave-send-defun)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
234 (define-key map "\C-c\C-ir" 'octave-send-region)
49334
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
235 (define-key map "\C-c\C-is" 'octave-show-process-buffer)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
236 (define-key map "\C-c\C-ih" 'octave-hide-process-buffer)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
237 (define-key map "\C-c\C-ik" 'octave-kill-process)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
238 (define-key map "\C-c\C-i\C-l" 'octave-send-line)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
239 (define-key map "\C-c\C-i\C-b" 'octave-send-block)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
240 (define-key map "\C-c\C-i\C-f" 'octave-send-defun)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
241 (define-key map "\C-c\C-i\C-r" 'octave-send-region)
49334
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
242 (define-key map "\C-c\C-i\C-s" 'octave-show-process-buffer)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
243 (define-key map "\C-c\C-i\C-h" 'octave-hide-process-buffer)
8dad7ccccdcb (octave-mode-map): Change C-c i bindings to C-c C-i.
Richard M. Stallman <rms@gnu.org>
parents: 47939
diff changeset
244 (define-key map "\C-c\C-i\C-k" 'octave-kill-process)
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
245 map)
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
246 "Keymap used in Octave mode.")
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
247
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
248
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
249
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
250 (easy-menu-define octave-mode-menu octave-mode-map
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
251 "Menu for Octave mode."
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
252 '("Octave"
98358
393e8f885464 (octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents: 94673
diff changeset
253 ("Lines"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
254 ["Previous Code Line" octave-previous-code-line t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
255 ["Next Code Line" octave-next-code-line t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
256 ["Begin of Continuation" octave-beginning-of-line t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
257 ["End of Continuation" octave-end-of-line t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
258 ["Split Line at Point" octave-indent-new-comment-line t])
98358
393e8f885464 (octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents: 94673
diff changeset
259 ("Blocks"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
260 ["Mark Block" octave-mark-block t]
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
261 ["Close Block" smie-close-block t])
98358
393e8f885464 (octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents: 94673
diff changeset
262 ("Functions"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
263 ["Indent Function" octave-indent-defun t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
264 ["Insert Function" octave-insert-defun t])
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
265 "-"
98358
393e8f885464 (octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents: 94673
diff changeset
266 ("Debug"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
267 ["Send Current Line" octave-send-line t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
268 ["Send Current Block" octave-send-block t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
269 ["Send Current Function" octave-send-defun t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
270 ["Send Region" octave-send-region t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
271 ["Show Process Buffer" octave-show-process-buffer t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
272 ["Hide Process Buffer" octave-hide-process-buffer t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
273 ["Kill Process" octave-kill-process t])
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
274 "-"
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
275 ["Indent Line" indent-according-to-mode t]
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
276 ["Complete Symbol" completion-at-point t]
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
277 "-"
109842
ecdbd21826de * lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109815
diff changeset
278 ["Toggle Abbrev Mode" abbrev-mode
ecdbd21826de * lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109815
diff changeset
279 :style toggle :selected abbrev-mode]
ecdbd21826de * lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109815
diff changeset
280 ["Toggle Auto-Fill Mode" auto-fill-mode
ecdbd21826de * lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109815
diff changeset
281 :style toggle :selected auto-fill-function]
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
282 "-"
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
283 ["Submit Bug Report" octave-submit-bug-report t]
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
284 "-"
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
285 ["Describe Octave Mode" describe-mode t]
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
286 ["Lookup Octave Index" info-lookup-symbol t]))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
287
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
288 (defvar octave-mode-syntax-table
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
289 (let ((table (make-syntax-table)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
290 (modify-syntax-entry ?\r " " table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
291 (modify-syntax-entry ?+ "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
292 (modify-syntax-entry ?- "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
293 (modify-syntax-entry ?= "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
294 (modify-syntax-entry ?* "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
295 (modify-syntax-entry ?/ "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
296 (modify-syntax-entry ?> "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
297 (modify-syntax-entry ?< "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
298 (modify-syntax-entry ?& "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
299 (modify-syntax-entry ?| "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
300 (modify-syntax-entry ?! "." table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
301 (modify-syntax-entry ?\\ "\\" table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
302 (modify-syntax-entry ?\' "." table)
94565
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
303 ;; Was "w" for abbrevs, but now that it's not necessary any more,
fe81b2cb42e0 (octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94496
diff changeset
304 (modify-syntax-entry ?\` "." table)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
305 (modify-syntax-entry ?\" "\"" table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
306 (modify-syntax-entry ?. "w" table)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
307 (modify-syntax-entry ?_ "w" table)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109755
diff changeset
308 ;; The "b" flag only applies to the second letter of the comstart
109755
1aa7bc345918 Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109754
diff changeset
309 ;; and the first letter of the comend, i.e. the "4b" below is ineffective.
1aa7bc345918 Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109754
diff changeset
310 ;; If we try to put `b' on the single-line comments, we get a similar
1aa7bc345918 Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109754
diff changeset
311 ;; problem where the % and # chars appear as first chars of the 2-char
1aa7bc345918 Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109754
diff changeset
312 ;; comend, so the multi-line ender is also turned into style-b.
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109755
diff changeset
313 ;; So we need the new "c" comment style.
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
314 (modify-syntax-entry ?\% "< 13" table)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
315 (modify-syntax-entry ?\# "< 13" table)
109757
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109755
diff changeset
316 (modify-syntax-entry ?\{ "(} 2c" table)
818e325e0469 Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109755
diff changeset
317 (modify-syntax-entry ?\} "){ 4c" table)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
318 (modify-syntax-entry ?\n ">" table)
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
319 table)
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
320 "Syntax table in use in `octave-mode' buffers.")
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
321
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
322 (defcustom octave-auto-indent nil
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
323 "Non-nil means indent line after a semicolon or space in Octave mode."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
324 :type 'boolean
26157
313a03652df3 Added (require 'custom) and deleted :version line from
Stephen Eglen <stephen@gnu.org>
parents: 25277
diff changeset
325 :group 'octave)
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
326
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
327 (defcustom octave-auto-newline nil
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
328 "Non-nil means automatically newline after a semicolon in Octave mode."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
329 :type 'boolean
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
330 :group 'octave)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
331
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
332 (defcustom octave-blink-matching-block t
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
333 "Control the blinking of matching Octave block keywords.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
334 Non-nil means show matching begin of block when inserting a space,
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
335 newline or semicolon after an else or end keyword."
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
336 :type 'boolean
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
337 :group 'octave)
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
338
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
339 (defcustom octave-block-offset 2
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
340 "Extra indentation applied to statements in Octave block structures."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
341 :type 'integer
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
342 :group 'octave)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
343
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
344 (defvar octave-block-comment-start
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
345 (concat (make-string 2 octave-comment-char) " ")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
346 "String to insert to start a new Octave comment on an empty line.")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
347
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
348 (defcustom octave-continuation-offset 4
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
349 "Extra indentation applied to Octave continuation lines."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
350 :type 'integer
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
351 :group 'octave)
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
352 (eval-and-compile
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
353 (defconst octave-continuation-marker-regexp "\\\\\\|\\.\\.\\."))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
354 (defvar octave-continuation-regexp
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
355 (concat "[^#%\n]*\\(" octave-continuation-marker-regexp
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
356 "\\)\\s-*\\(\\s<.*\\)?$"))
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
357 (defcustom octave-continuation-string "\\"
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
358 "Character string used for Octave continuation lines. Normally \\."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
359 :type 'string
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
360 :group 'octave)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
361
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
362 (defvar octave-completion-alist nil
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
363 "Alist of Octave symbols for completion in Octave mode.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
364 Each element looks like (VAR . VAR), where the car and cdr are the same
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
365 symbol (an Octave command or variable name).
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
366 Currently, only builtin variables can be completed.")
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
367
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
368 (defvar octave-mode-imenu-generic-expression
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
369 (list
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
370 ;; Functions
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
371 (list nil octave-function-header-regexp 3))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
372 "Imenu expression for Octave mode. See `imenu-generic-expression'.")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
373
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
374 (defcustom octave-mode-hook nil
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
375 "Hook to be run when Octave mode is started."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
376 :type 'hook
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
377 :group 'octave)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
378
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
379 (defcustom octave-send-show-buffer t
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
380 "Non-nil means display `inferior-octave-buffer' after sending to it."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
381 :type 'boolean
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
382 :group 'octave)
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
383 (defcustom octave-send-line-auto-forward t
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
384 "Control auto-forward after sending to the inferior Octave process.
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
385 Non-nil means always go to the next Octave code line after sending."
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
386 :type 'boolean
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
387 :group 'octave)
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
388 (defcustom octave-send-echo-input t
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
389 "Non-nil means echo input sent to the inferior Octave process."
20781
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
390 :type 'boolean
6f55b3849106 Customized.
Andreas Schwab <schwab@suse.de>
parents: 20459
diff changeset
391 :group 'octave)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
392
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
393
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
394 ;;; SMIE indentation
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
395
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
396 (require 'smie)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
397
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
398 (defconst octave-operator-table
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
399 '((assoc ";" "\n") (assoc ",") ; The doc claims they have equal precedence!?
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
400 (right "=" "+=" "-=" "*=" "/=")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
401 (assoc "&&") (assoc "||") ; The doc claims they have equal precedence!?
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
402 (assoc "&") (assoc "|") ; The doc claims they have equal precedence!?
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
403 (nonassoc "<" "<=" "==" ">=" ">" "!=" "~=")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
404 (nonassoc ":") ;No idea what this is.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
405 (assoc "+" "-")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
406 (assoc "*" "/" "\\" ".\\" ".*" "./")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
407 (nonassoc "'" ".'")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
408 (nonassoc "++" "--" "!" "~") ;And unary "+" and "-".
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
409 (right "^" "**" ".^" ".**")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
410 ;; It's not really an operator, but for indentation purposes it
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
411 ;; could be convenient to treat it as one.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
412 (assoc "...")))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
413
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
414 (defconst octave-smie-bnf-table
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
415 '((atom)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
416 ;; We can't distinguish the first element in a sequence with
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
417 ;; precedence grammars, so we can't distinguish the condition
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
418 ;; if the `if' from the subsequent body, for example.
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
419 ;; This has to be done later in the indentation rules.
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
420 (exp (exp "\n" exp)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
421 ;; We need to mention at least one of the operators in this part
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
422 ;; of the grammar: if the BNF and the operator table have
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
423 ;; no overlap, SMIE can't know how they relate.
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
424 (exp ";" exp)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
425 ("try" exp "catch" exp "end_try_catch")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
426 ("try" exp "catch" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
427 ("unwind_protect" exp
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
428 "unwind_protect_cleanup" exp "end_unwind_protect")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
429 ("unwind_protect" exp "unwind_protect_cleanup" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
430 ("for" exp "endfor")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
431 ("for" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
432 ("do" exp "until" atom)
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
433 ("while" exp "endwhile")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
434 ("while" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
435 ("if" exp "endif")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
436 ("if" exp "else" exp "endif")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
437 ("if" exp "elseif" exp "else" exp "endif")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
438 ("if" exp "elseif" exp "elseif" exp "else" exp "endif")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
439 ("if" exp "elseif" exp "elseif" exp "else" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
440 ("switch" exp "case" exp "endswitch")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
441 ("switch" exp "case" exp "otherwise" exp "endswitch")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
442 ("switch" exp "case" exp "case" exp "otherwise" exp "endswitch")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
443 ("switch" exp "case" exp "case" exp "otherwise" exp "end")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
444 ("function" exp "endfunction")
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
445 ("function" exp "end"))
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
446 ;; (fundesc (atom "=" atom))
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
447 ))
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
448
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
449 (defconst octave-smie-grammar
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
450 (smie-prec2->grammar
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
451 (smie-merge-prec2s
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
452 (smie-bnf->prec2 octave-smie-bnf-table
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
453 '((assoc "\n" ";")))
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
454
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
455 (smie-precs->prec2 octave-operator-table))))
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
456
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
457 ;; Tokenizing needs to be refined so that ";;" is treated as two
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
458 ;; tokens and also so as to recognize the \n separator (and
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
459 ;; corresponding continuation lines).
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
460
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
461 (defconst octave-operator-regexp
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
462 (regexp-opt (apply 'append (mapcar 'cdr octave-operator-table))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
463
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
464 (defun octave-smie-backward-token ()
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
465 (let ((pos (point)))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
466 (forward-comment (- (point)))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
467 (cond
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
468 ((and (not (eq (char-before) ?\;)) ;Coalesce ";" and "\n".
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
469 (> pos (line-end-position))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
470 (if (looking-back octave-continuation-marker-regexp (- (point) 3))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
471 (progn
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
472 (goto-char (match-beginning 0))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
473 (forward-comment (- (point)))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
474 nil)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
475 t)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
476 ;; Ignore it if it's within parentheses.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
477 (let ((ppss (syntax-ppss)))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
478 (not (and (nth 1 ppss)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
479 (eq ?\( (char-after (nth 1 ppss)))))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
480 (skip-chars-forward " \t")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
481 ;; Why bother distinguishing \n and ;?
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
482 ";") ;;"\n"
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
483 ((and (looking-back octave-operator-regexp (- (point) 3) 'greedy)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
484 ;; Don't mistake a string quote for a transpose.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
485 (not (looking-back "\\s\"" (1- (point)))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
486 (goto-char (match-beginning 0))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
487 (match-string-no-properties 0))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
488 (t
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
489 (smie-default-backward-token)))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
490
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
491 (defun octave-smie-forward-token ()
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
492 (skip-chars-forward " \t")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
493 (when (looking-at (eval-when-compile
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
494 (concat "\\(" octave-continuation-marker-regexp
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
495 "\\)[ \t]*\\($\\|[%#]\\)")))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
496 (goto-char (match-end 1))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
497 (forward-comment 1))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
498 (cond
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
499 ((and (looking-at "$\\|[%#]")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
500 ;; Ignore it if it's within parentheses.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
501 (prog1 (let ((ppss (syntax-ppss)))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
502 (not (and (nth 1 ppss)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
503 (eq ?\( (char-after (nth 1 ppss))))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
504 (forward-comment (point-max))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
505 ;; Why bother distinguishing \n and ;?
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
506 ";") ;;"\n"
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
507 ((looking-at ";[ \t]*\\($\\|[%#]\\)")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
508 ;; Combine the ; with the subsequent \n.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
509 (goto-char (match-beginning 1))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
510 (forward-comment 1)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
511 ";")
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
512 ((and (looking-at octave-operator-regexp)
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
513 ;; Don't mistake a string quote for a transpose.
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
514 (not (looking-at "\\s\"")))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
515 (goto-char (match-end 0))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
516 (match-string-no-properties 0))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
517 (t
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
518 (smie-default-forward-token))))
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
519
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
520 (defun octave-smie-rules (kind token)
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
521 (pcase (cons kind token)
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
522 ;; We could set smie-indent-basic instead, but that would have two
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
523 ;; disadvantages:
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
524 ;; - changes to octave-block-offset wouldn't take effect immediately.
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
525 ;; - edebug wouldn't show the use of this variable.
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
526 (`(:elem . basic) octave-block-offset)
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
527 ;; Since "case" is in the same BNF rules as switch..end, SMIE by default
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
528 ;; aligns it with "switch".
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
529 (`(:before . "case") (if (not (smie-rule-sibling-p)) octave-block-offset))
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
530 (`(:after . ";")
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
531 (if (smie-rule-parent-p "function" "if" "while" "else" "elseif" "for"
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
532 "otherwise" "case" "try" "catch" "unwind_protect"
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
533 "unwind_protect_cleanup")
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
534 (smie-rule-parent octave-block-offset)
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
535 ;; For (invalid) code between switch and case.
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
536 ;; (if (smie-parent-p "switch") 4)
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
537 0))))
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
538
110270
c7809974cd64 Misc cleanups and simplifications.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110164
diff changeset
539 (defvar electric-indent-chars)
c7809974cd64 Misc cleanups and simplifications.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110164
diff changeset
540
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
541 ;;;###autoload
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
542 (define-derived-mode octave-mode prog-mode "Octave"
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
543 "Major mode for editing Octave code.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
544
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
545 This mode makes it easier to write Octave code by helping with
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
546 indentation, doing some of the typing for you (with Abbrev mode) and by
106697
ac408704629c lisp/*: Fix typos in docstrings and messages.
Juanma Barranquero <lekktu@gmail.com>
parents: 106380
diff changeset
547 showing keywords, comments, strings, etc. in different faces (with
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
548 Font Lock mode on terminals that support it).
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
549
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
550 Octave itself is a high-level language, primarily intended for numerical
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
551 computations. It provides a convenient command line interface for
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
552 solving linear and nonlinear problems numerically. Function definitions
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
553 can also be stored in files, and it can be used in a batch mode (which
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
554 is why you need this mode!).
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
555
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
556 The latest released version of Octave is always available via anonymous
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
557 ftp from ftp.octave.org in the directory `/pub/octave'. Complete
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
558 source and binaries for several popular systems are available.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
559
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
560 Type \\[list-abbrevs] to display the built-in abbrevs for Octave keywords.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
561
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
562 Keybindings
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
563 ===========
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
564
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
565 \\{octave-mode-map}
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
566
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
567 Variables you can use to customize Octave mode
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
568 ==============================================
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
569
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
570 `octave-auto-indent'
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
571 Non-nil means indent current line after a semicolon or space.
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
572 Default is nil.
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
573
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
574 `octave-auto-newline'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
575 Non-nil means auto-insert a newline and indent after a semicolon.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
576 Default is nil.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
577
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
578 `octave-blink-matching-block'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
579 Non-nil means show matching begin of block when inserting a space,
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
580 newline or semicolon after an else or end keyword. Default is t.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
581
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
582 `octave-block-offset'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
583 Extra indentation applied to statements in block structures.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
584 Default is 2.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
585
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
586 `octave-continuation-offset'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
587 Extra indentation applied to Octave continuation lines.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
588 Default is 4.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
589
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
590 `octave-continuation-string'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
591 String used for Octave continuation lines.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
592 Default is a backslash.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
594 `octave-send-echo-input'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
595 Non-nil means always display `inferior-octave-buffer' after sending a
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
596 command to the inferior Octave process.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
597
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
598 `octave-send-line-auto-forward'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
599 Non-nil means always go to the next unsent line of Octave code after
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
600 sending a line to the inferior Octave process.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
601
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
602 `octave-send-echo-input'
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
603 Non-nil means echo input sent to the inferior Octave process.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
604
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
605 Turning on Octave mode runs the hook `octave-mode-hook'.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
606
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
607 To begin using this mode for all `.m' files that you edit, add the
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
608 following lines to your `.emacs' file:
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
609
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
610 (add-to-list 'auto-mode-alist '(\"\\\\.m\\\\'\" . octave-mode))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
611
85052
c25dd5c18af4 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 84655
diff changeset
612 To automatically turn on the abbrev and auto-fill features,
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
613 add the following lines to your `.emacs' file as well:
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
614
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
615 (add-hook 'octave-mode-hook
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
616 (lambda ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
617 (abbrev-mode 1)
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
618 (auto-fill-mode 1)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
619
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
620 To submit a problem report, enter \\[octave-submit-bug-report] from \
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
621 an Octave mode buffer.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
622 This automatically sets up a mail buffer with version information
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
623 already added. You just need to add a description of the problem,
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
624 including a reproducible test case and send the message."
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
625 (setq local-abbrev-table octave-abbrev-table)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
626
111440
b72ff43b041f * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111232
diff changeset
627 (smie-setup octave-smie-grammar #'octave-smie-rules
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
628 :forward-token #'octave-smie-forward-token
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
629 :backward-token #'octave-smie-backward-token)
110038
6939db1ee97b Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109842
diff changeset
630 (set (make-local-variable 'smie-indent-basic) 'octave-block-offset)
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
631
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
632 (set (make-local-variable 'smie-blink-matching-triggers)
111232
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
633 (cons ?\; smie-blink-matching-triggers))
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
634 (unless octave-blink-matching-block
a9904c1962db SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111205
diff changeset
635 (remove-hook 'post-self-insert-hook #'smie-blink-matching-open 'local))
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
636
111205
e6399f46aefa * lisp/electric.el (electric-indent-chars): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110802
diff changeset
637 (set (make-local-variable 'electric-indent-chars)
e6399f46aefa * lisp/electric.el (electric-indent-chars): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110802
diff changeset
638 (cons ?\; electric-indent-chars))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
639
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
640 (set (make-local-variable 'comment-start) octave-comment-start)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
641 (set (make-local-variable 'comment-end) "")
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
642 ;; Don't set it here: it's not really a property of the language,
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
643 ;; just a personal preference of the author.
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
644 ;; (set (make-local-variable 'comment-column) 32)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
645 (set (make-local-variable 'comment-start-skip) "\\s<+\\s-*")
109753
8646a04a2d97 * lisp/progmodes/octave-mod.el (octave-mode-map): Use comment-dwim.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108714
diff changeset
646 (set (make-local-variable 'comment-add) 1)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
647
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
648 (set (make-local-variable 'parse-sexp-ignore-comments) t)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
649 (set (make-local-variable 'paragraph-start)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
650 (concat "\\s-*$\\|" page-delimiter))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
651 (set (make-local-variable 'paragraph-separate) paragraph-start)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
652 (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
653 (set (make-local-variable 'fill-paragraph-function) 'octave-fill-paragraph)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
654 ;; FIXME: Why disable it?
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
655 ;; (set (make-local-variable 'adaptive-fill-regexp) nil)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
656 ;; Again, this is not a property of the language, don't set it here.
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
657 ;; (set (make-local-variable 'fill-column) 72)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
658 (set (make-local-variable 'normal-auto-fill-function) 'octave-auto-fill)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
659
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
660 (set (make-local-variable 'font-lock-defaults)
110305
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
661 '(octave-font-lock-keywords))
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
662
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
663 (set (make-local-variable 'syntax-propertize-function)
b10051866f51 New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110270
diff changeset
664 #'octave-syntax-propertize-function)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
665
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
666 (set (make-local-variable 'imenu-generic-expression)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
667 octave-mode-imenu-generic-expression)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
668 (set (make-local-variable 'imenu-case-fold-search) nil)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
669
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
670 (add-hook 'completion-at-point-functions
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
671 'octave-completion-at-point-function nil t)
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
672 (set (make-local-variable 'beginning-of-defun-function)
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
673 'octave-beginning-of-defun)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
674
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
675 (easy-menu-add octave-mode-menu)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
676 (octave-initialize-completions)
62772
f2892faa87d4 * progmodes/ada-mode.el (ada-mode):
Lute Kamstra <lute@gnu.org>
parents: 52930
diff changeset
677 (run-mode-hooks 'octave-mode-hook))
94496
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
678
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
679 (defvar info-lookup-mode)
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
680
94496
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
681 (defun octave-help ()
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
682 "Get help on Octave symbols from the Octave info files.
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
683 Look up symbol in the function, operator and variable indices of the info files."
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
684 (let ((info-lookup-mode 'octave-mode))
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
685 (call-interactively 'info-lookup-symbol)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
686
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
687 ;;; Miscellaneous useful functions
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
688
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
689 (defsubst octave-in-comment-p ()
78487
419c5c316b51 Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78234
diff changeset
690 "Return t if point is inside an Octave comment."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
691 (save-excursion
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
692 ;; FIXME: use syntax-ppss?
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
693 (nth 4 (parse-partial-sexp (line-beginning-position) (point)))))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
694
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
695 (defsubst octave-in-string-p ()
78487
419c5c316b51 Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78234
diff changeset
696 "Return t if point is inside an Octave string."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
697 (save-excursion
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
698 ;; FIXME: use syntax-ppss?
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
699 (nth 3 (parse-partial-sexp (line-beginning-position) (point)))))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
700
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
701 (defsubst octave-not-in-string-or-comment-p ()
78487
419c5c316b51 Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78234
diff changeset
702 "Return t if point is not inside an Octave string or comment."
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
703 ;; FIXME: Use syntax-ppss?
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
704 (let ((pps (parse-partial-sexp (line-beginning-position) (point))))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
705 (not (or (nth 3 pps) (nth 4 pps)))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
706
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
707
79070
b5a52e129c97 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 78487
diff changeset
708 (defun octave-looking-at-kw (regexp)
79072
c766bbd72b1d (octave-looking-at-kw): Add doc string.
Glenn Morris <rgm@gnu.org>
parents: 79070
diff changeset
709 "Like `looking-at', but sets `case-fold-search' nil."
79070
b5a52e129c97 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 78487
diff changeset
710 (let ((case-fold-search nil))
b5a52e129c97 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 78487
diff changeset
711 (looking-at regexp)))
b5a52e129c97 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 78487
diff changeset
712
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
713 (defun octave-maybe-insert-continuation-string ()
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
714 (if (or (octave-in-comment-p)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
715 (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
716 (beginning-of-line)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
717 (looking-at octave-continuation-regexp)))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
718 nil
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
719 (delete-horizontal-space)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
720 (insert (concat " " octave-continuation-string))))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
721
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
722
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
723 ;;; Indentation
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
724
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
725 (defun octave-indent-new-comment-line ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
726 "Break Octave line at point, continuing comment if within one.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
727 If within code, insert `octave-continuation-string' before breaking the
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
728 line. If within a string, signal an error.
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
729 The new line is properly indented."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
730 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
731 (delete-horizontal-space)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
732 (cond
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
733 ((octave-in-comment-p)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
734 (indent-new-comment-line))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
735 ((octave-in-string-p)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
736 (error "Cannot split a code line inside a string"))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
737 (t
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
738 (insert (concat " " octave-continuation-string))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
739 (octave-reindent-then-newline-and-indent))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
740
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
741 (defun octave-indent-defun ()
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
742 "Properly indent the Octave function which contains point."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
743 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
744 (save-excursion
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
745 (mark-defun)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
746 (message "Indenting function...")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
747 (indent-region (point) (mark) nil))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
748 (message "Indenting function...done."))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
749
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
750
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
751 ;;; Motion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
752 (defun octave-next-code-line (&optional arg)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
753 "Move ARG lines of Octave code forward (backward if ARG is negative).
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
754 Skips past all empty and comment lines. Default for ARG is 1.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
755
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
756 On success, return 0. Otherwise, go as far as possible and return -1."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
757 (interactive "p")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
758 (or arg (setq arg 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
759 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
760 (let ((n 0)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
761 (inc (if (> arg 0) 1 -1)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
762 (while (and (/= arg 0) (= n 0))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
763 (setq n (forward-line inc))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
764 (while (and (= n 0)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
765 (looking-at "\\s-*\\($\\|\\s<\\)"))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
766 (setq n (forward-line inc)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
767 (setq arg (- arg inc)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
768 n))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
769
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
770 (defun octave-previous-code-line (&optional arg)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
771 "Move ARG lines of Octave code backward (forward if ARG is negative).
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
772 Skips past all empty and comment lines. Default for ARG is 1.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
773
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
774 On success, return 0. Otherwise, go as far as possible and return -1."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
775 (interactive "p")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
776 (or arg (setq arg 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
777 (octave-next-code-line (- arg)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
778
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
779 (defun octave-beginning-of-line ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
780 "Move point to beginning of current Octave line.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
781 If on an empty or comment line, go to the beginning of that line.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
782 Otherwise, move backward to the beginning of the first Octave code line
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
783 which is not inside a continuation statement, i.e., which does not
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
784 follow a code line ending in `...' or `\\', or is inside an open
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
785 parenthesis list."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
786 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
787 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
788 (if (not (looking-at "\\s-*\\($\\|\\s<\\)"))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
789 (while (or (condition-case nil
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
790 (progn
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
791 (up-list -1)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
792 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
793 t)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
794 (error nil))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
795 (and (or (looking-at "\\s-*\\($\\|\\s<\\)")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
796 (save-excursion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
797 (if (zerop (octave-previous-code-line))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
798 (looking-at octave-continuation-regexp))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
799 (zerop (forward-line -1)))))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
800
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
801 (defun octave-end-of-line ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
802 "Move point to end of current Octave line.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
803 If on an empty or comment line, go to the end of that line.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
804 Otherwise, move forward to the end of the first Octave code line which
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
805 does not end in `...' or `\\' or is inside an open parenthesis list."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
806 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
807 (end-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
808 (if (save-excursion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
809 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
810 (looking-at "\\s-*\\($\\|\\s<\\)"))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
811 ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
812 (while (or (condition-case nil
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
813 (progn
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
814 (up-list 1)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
815 (end-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
816 t)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
817 (error nil))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
818 (and (save-excursion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
819 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
820 (or (looking-at "\\s-*\\($\\|\\s<\\)")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
821 (looking-at octave-continuation-regexp)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
822 (zerop (forward-line 1)))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
823 (end-of-line)))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
824
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
825 (defun octave-mark-block ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
826 "Put point at the beginning of this Octave block, mark at the end.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
827 The block marked is the one that contains point or follows point."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
828 (interactive)
110066
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
829 (unless (or (looking-at "\\s(")
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
830 (save-excursion
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
831 (let* ((token (funcall smie-forward-token-function))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
832 (level (assoc token smie-op-levels)))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
833 (and level (null (cadr level))))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
834 (backward-up-list 1))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
835 (mark-sexp))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
836
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
837 (defun octave-beginning-of-defun (&optional arg)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
838 "Move backward to the beginning of an Octave function.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
839 With positive ARG, do it that many times. Negative argument -N means
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
840 move forward to Nth following beginning of a function.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
841 Returns t unless search stops at the beginning or end of the buffer."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
842 (let* ((arg (or arg 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
843 (inc (if (> arg 0) 1 -1))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
844 (found nil)
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
845 (case-fold-search nil))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
846 (and (not (eobp))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
847 (not (and (> arg 0) (looking-at "\\<function\\>")))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
848 (skip-syntax-forward "w"))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
849 (while (and (/= arg 0)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
850 (setq found
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
851 (re-search-backward "\\<function\\>" inc)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
852 (if (octave-not-in-string-or-comment-p)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
853 (setq arg (- arg inc))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
854 (if found
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
855 (progn
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
856 (and (< inc 0) (goto-char (match-beginning 0)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
857 t))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
858
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
860 ;;; Filling
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
861 (defun octave-auto-fill ()
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
862 "Perform auto-fill in Octave mode.
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
863 Returns nil if no feasible place to break the line could be found, and t
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
864 otherwise."
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
865 (let (fc give-up)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
866 (if (or (null (setq fc (current-fill-column)))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
867 (save-excursion
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
868 (beginning-of-line)
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
869 (and auto-fill-inhibit-regexp
79070
b5a52e129c97 John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents: 78487
diff changeset
870 (octave-looking-at-kw auto-fill-inhibit-regexp))))
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
871 nil ; Can't do anything
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
872 (if (and (not (octave-in-comment-p))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
873 (> (current-column) fc))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
874 (setq fc (- fc (+ (length octave-continuation-string) 1))))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
875 (while (and (not give-up) (> (current-column) fc))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
876 (let* ((opoint (point))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
877 (fpoint
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
878 (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
879 (move-to-column (+ fc 1))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
880 (skip-chars-backward "^ \t\n")
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
881 ;; If we're at the beginning of the line, break after
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
882 ;; the first word
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
883 (if (bolp)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
884 (re-search-forward "[ \t]" opoint t))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
885 ;; If we're in a comment line, don't break after the
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
886 ;; comment chars
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
887 (if (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
888 (skip-syntax-backward " <")
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
889 (bolp))
52930
069cb76731fd (octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
890 (re-search-forward "[ \t]" (line-end-position)
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
891 'move))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
892 ;; If we're not in a comment line and just ahead the
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
893 ;; continuation string, don't break here.
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
894 (if (and (not (octave-in-comment-p))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
895 (looking-at
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
896 (concat "\\s-*"
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
897 (regexp-quote
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
898 octave-continuation-string)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
899 "\\s-*$")))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
900 (end-of-line))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
901 (skip-chars-backward " \t")
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
902 (point))))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
903 (if (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
904 (goto-char fpoint)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
905 (not (or (bolp) (eolp))))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
906 (let ((prev-column (current-column)))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
907 (if (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
908 (skip-chars-backward " \t")
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
909 (= (point) fpoint))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
910 (progn
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
911 (octave-maybe-insert-continuation-string)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
912 (indent-new-comment-line t))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
913 (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
914 (goto-char fpoint)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
915 (octave-maybe-insert-continuation-string)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
916 (indent-new-comment-line t)))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
917 (if (>= (current-column) prev-column)
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
918 (setq give-up t)))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
919 (setq give-up t))))
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
920 (not give-up))))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
921
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
922 (defun octave-fill-paragraph (&optional arg)
110066
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
923 "Fill paragraph of Octave code, handling Octave comments."
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
924 ;; FIXME: difference with generic fill-paragraph:
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
925 ;; - code lines are only split, never joined.
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
926 ;; - \n that end comments are never removed.
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
927 ;; - insert continuation marker when splitting code lines.
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
928 (interactive "P")
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
929 (save-excursion
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
930 (let ((end (progn (forward-paragraph) (copy-marker (point) t)))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
931 (beg (progn
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
932 (forward-paragraph -1)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
933 (skip-chars-forward " \t\n")
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
934 (beginning-of-line)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
935 (point)))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
936 (cfc (current-fill-column))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
937 comment-prefix)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
938 (goto-char beg)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
939 (while (< (point) end)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
940 (condition-case nil
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
941 (indent-according-to-mode)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
942 (error nil))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
943 (move-to-column cfc)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
944 ;; First check whether we need to combine non-empty comment lines
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
945 (if (and (< (current-column) cfc)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
946 (octave-in-comment-p)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
947 (not (save-excursion
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
948 (beginning-of-line)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
949 (looking-at "^\\s-*\\s<+\\s-*$"))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
950 ;; This is a nonempty comment line which does not extend
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
951 ;; past the fill column. If it is followed by a nonempty
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
952 ;; comment line with the same comment prefix, try to
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
953 ;; combine them, and repeat this until either we reach the
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
954 ;; fill-column or there is nothing more to combine.
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
955 (progn
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
956 ;; Get the comment prefix
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
957 (save-excursion
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
958 (beginning-of-line)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
959 (while (and (re-search-forward "\\s<+")
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
960 (not (octave-in-comment-p))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
961 (setq comment-prefix (match-string 0)))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
962 ;; And keep combining ...
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
963 (while (and (< (current-column) cfc)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
964 (save-excursion
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
965 (forward-line 1)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
966 (and (looking-at
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
967 (concat "^\\s-*"
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
968 comment-prefix
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
969 "\\S<"))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
970 (not (looking-at
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
971 (concat "^\\s-*"
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
972 comment-prefix
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
973 "\\s-*$"))))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
974 (delete-char 1)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
975 (re-search-forward comment-prefix)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
976 (delete-region (match-beginning 0) (match-end 0))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
977 (fixup-whitespace)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
978 (move-to-column cfc))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
979 ;; We might also try to combine continued code lines> Perhaps
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
980 ;; some other time ...
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
981 (skip-chars-forward "^ \t\n")
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
982 (delete-horizontal-space)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
983 (if (or (< (current-column) cfc)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
984 (and (= (current-column) cfc) (eolp)))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
985 (forward-line 1)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
986 (if (not (eolp)) (insert " "))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
987 (or (octave-auto-fill)
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
988 (forward-line 1))))
5ef877197e04 Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110038
diff changeset
989 t)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
990
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
991
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
992 ;;; Completions
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
993 (defun octave-initialize-completions ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
994 "Create an alist for Octave completions."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
995 (if octave-completion-alist
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
996 ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
997 (setq octave-completion-alist
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
998 (append octave-reserved-words
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
999 octave-text-functions
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1000 octave-variables))))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1001
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1002 (defun octave-completion-at-point-function ()
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1003 "Find the text to complete and the corresponding table."
109755
1aa7bc345918 Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109754
diff changeset
1004 (let* ((beg (save-excursion (backward-sexp 1) (point)))
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1005 (end (point)))
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1006 (if (< beg (point))
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1007 ;; Extend region past point, if applicable.
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1008 (save-excursion (goto-char beg) (forward-sexp 1)
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1009 (setq end (max end (point)))))
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1010 (list beg end octave-completion-alist)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1011
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1012 (defun octave-complete-symbol ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1013 "Perform completion on Octave symbol preceding point.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1014 Compare that symbol against Octave's reserved words and builtin
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1015 variables."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1016 (interactive)
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1017 (apply 'completion-in-region (octave-completion-at-point-function)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1018
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1019 ;;; Electric characters && friends
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1020 (defun octave-reindent-then-newline-and-indent ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021 "Reindent current Octave line, insert newline, and indent the new line.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1022 If Abbrev mode is on, expand abbrevs first."
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1023 ;; FIXME: None of this is Octave-specific.
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1024 (interactive)
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1025 (reindent-then-newline-and-indent))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1026
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1027 (defun octave-electric-semi ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1028 "Insert a semicolon in Octave mode.
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1029 Maybe expand abbrevs and blink matching block open keywords.
106697
ac408704629c lisp/*: Fix typos in docstrings and messages.
Juanma Barranquero <lekktu@gmail.com>
parents: 106380
diff changeset
1030 Reindent the line if `octave-auto-indent' is non-nil.
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1031 Insert a newline if `octave-auto-newline' is non-nil."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1032 (interactive)
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
1033 (setq last-command-event ?\;)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1034 (if (not (octave-not-in-string-or-comment-p))
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
1035 (self-insert-command 1)
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1036 (if octave-auto-indent
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1037 (indent-according-to-mode))
110164
da442f29c7b6 Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110066
diff changeset
1038 (self-insert-command 1)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1039 (if octave-auto-newline
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1040 (newline-and-indent))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1041
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1042 (defun octave-electric-space ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1043 "Insert a space in Octave mode.
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1044 Maybe expand abbrevs and blink matching block open keywords.
106697
ac408704629c lisp/*: Fix typos in docstrings and messages.
Juanma Barranquero <lekktu@gmail.com>
parents: 106380
diff changeset
1045 Reindent the line if `octave-auto-indent' is non-nil."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1046 (interactive)
101002
3b3c7e10cd97 Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1047 (setq last-command-event ? )
67467
7f9de4e59fcf (octave-electric-space): Don't indent comments or strings if
Eli Zaretskii <eliz@gnu.org>
parents: 66963
diff changeset
1048 (if (and octave-auto-indent
7f9de4e59fcf (octave-electric-space): Don't indent comments or strings if
Eli Zaretskii <eliz@gnu.org>
parents: 66963
diff changeset
1049 (not (octave-not-in-string-or-comment-p)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1050 (progn
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1051 (indent-according-to-mode)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1052 (self-insert-command 1))
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1053 (if (and octave-auto-indent
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1054 (save-excursion
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1055 (skip-syntax-backward " ")
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1056 (not (bolp))))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1057 (indent-according-to-mode))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1058 (self-insert-command 1)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1059
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1060 (defun octave-abbrev-start ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1061 "Start entering an Octave abbreviation.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1062 If Abbrev mode is turned on, typing ` (grave accent) followed by ? or
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1063 \\[help-command] lists all Octave abbrevs. Any other key combination is
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1064 executed normally.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1065 Note that all Octave mode abbrevs start with a grave accent."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1066 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1067 (if (not abbrev-mode)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1068 (self-insert-command 1)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1069 (let (c)
101002
3b3c7e10cd97 Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
1070 (insert last-command-event)
85511
f873840f9fea * emulation/edt-mapper.el (function-key-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85277
diff changeset
1071 (if (if (featurep 'xemacs)
23848
7896e341d77f (octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents: 21669
diff changeset
1072 (or (eq (event-to-character (setq c (next-event))) ??)
7896e341d77f (octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents: 21669
diff changeset
1073 (eq (event-to-character c) help-char))
7896e341d77f (octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents: 21669
diff changeset
1074 (or (eq (setq c (read-event)) ??)
7896e341d77f (octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents: 21669
diff changeset
1075 (eq c help-char)))
7896e341d77f (octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents: 21669
diff changeset
1076 (let ((abbrev-table-name-list '(octave-abbrev-table)))
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1077 (list-abbrevs))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1078 (setq unread-command-events (list c))))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1079
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1080 (define-skeleton octave-insert-defun
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1081 "Insert an Octave function skeleton.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1082 Prompt for the function's name, arguments and return values (to be
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1083 entered without parens)."
109754
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1084 (let* ((defname (substring (buffer-name) 0 -2))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1085 (name (read-string (format "Function name (default %s): " defname)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1086 nil nil defname))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1087 (args (read-string "Arguments: "))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1088 (vals (read-string "Return values: ")))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1089 (format "%s%s (%s)"
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1090 (cond
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1091 ((string-equal vals "") vals)
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1092 ((string-match "[ ,]" vals) (concat "[" vals "] = "))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1093 (t (concat vals " = ")))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1094 name
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1095 args))
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1096 \n "function " > str \n \n
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1097 octave-block-comment-start "usage: " str \n
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1098 octave-block-comment-start \n octave-block-comment-start
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1099 \n _ \n
47ffebe76e42 Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109753
diff changeset
1100 "endfunction" > \n)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1101
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1102 ;;; Communication with the inferior Octave process
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1103 (defun octave-kill-process ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1104 "Kill inferior Octave process and its buffer."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1105 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1106 (if inferior-octave-process
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1107 (progn
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1108 (process-send-string inferior-octave-process "quit;\n")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1109 (accept-process-output inferior-octave-process)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1110 (if inferior-octave-buffer
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1111 (kill-buffer inferior-octave-buffer)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1112
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1113 (defun octave-show-process-buffer ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1114 "Make sure that `inferior-octave-buffer' is displayed."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1115 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1116 (if (get-buffer inferior-octave-buffer)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1117 (display-buffer inferior-octave-buffer)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1118 (message "No buffer named %s" inferior-octave-buffer)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1119
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1120 (defun octave-hide-process-buffer ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1121 "Delete all windows that display `inferior-octave-buffer'."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1122 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1123 (if (get-buffer inferior-octave-buffer)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1124 (delete-windows-on inferior-octave-buffer)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1125 (message "No buffer named %s" inferior-octave-buffer)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1126
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1127 (defun octave-send-region (beg end)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1128 "Send current region to the inferior Octave process."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1129 (interactive "r")
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
1130 (inferior-octave t)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1131 (let ((proc inferior-octave-process)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1132 (string (buffer-substring-no-properties beg end))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1133 line)
94496
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1134 (with-current-buffer inferior-octave-buffer
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1135 (setq inferior-octave-output-list nil)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1136 (while (not (string-equal string ""))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1137 (if (string-match "\n" string)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1138 (setq line (substring string 0 (match-beginning 0))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1139 string (substring string (match-end 0)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1140 (setq line string string ""))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1141 (setq inferior-octave-receive-in-progress t)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1142 (inferior-octave-send-list-and-digest (list (concat line "\n")))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1143 (while inferior-octave-receive-in-progress
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1144 (accept-process-output proc))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1145 (insert-before-markers
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1146 (mapconcat 'identity
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1147 (append
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1148 (if octave-send-echo-input (list line) (list ""))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1149 (mapcar 'inferior-octave-strip-ctrl-g
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1150 inferior-octave-output-list)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1151 (list inferior-octave-output-string))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1152 "\n")))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1153 (if octave-send-show-buffer
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1154 (display-buffer inferior-octave-buffer)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1155
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1156 (defun octave-send-block ()
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
1157 "Send current Octave block to the inferior Octave process."
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1158 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1159 (save-excursion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1160 (octave-mark-block)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1161 (octave-send-region (point) (mark))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1162
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1163 (defun octave-send-defun ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1164 "Send current Octave function to the inferior Octave process."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1165 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1166 (save-excursion
109815
7714e8a59020 Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109757
diff changeset
1167 (mark-defun)
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1168 (octave-send-region (point) (mark))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1169
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1170 (defun octave-send-line (&optional arg)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1171 "Send current Octave code line to the inferior Octave process.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1172 With positive prefix ARG, send that many lines.
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1173 If `octave-send-line-auto-forward' is non-nil, go to the next unsent
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1174 code line."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1175 (interactive "P")
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1176 (or arg (setq arg 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1177 (if (> arg 0)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1178 (let (beg end)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1179 (beginning-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1180 (setq beg (point))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1181 (octave-next-code-line (- arg 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1182 (end-of-line)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1183 (setq end (point))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1184 (if octave-send-line-auto-forward
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1185 (octave-next-code-line 1))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1186 (octave-send-region beg end))))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1187
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1188 (defun octave-eval-print-last-sexp ()
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1189 "Evaluate Octave sexp before point and print value into current buffer."
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1190 (interactive)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1191 (inferior-octave t)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1192 (let ((standard-output (current-buffer))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1193 (print-escape-newlines nil)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1194 (opoint (point)))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1195 (terpri)
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49334
diff changeset
1196 (prin1
16901
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1197 (save-excursion
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1198 (forward-sexp -1)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1199 (inferior-octave-send-list-and-digest
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1200 (list (concat (buffer-substring-no-properties (point) opoint)
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1201 "\n")))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1202 (mapconcat 'identity inferior-octave-output-list "\n")))
f2035f66dba0 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1203 (terpri)))
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1204
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1205 ;;; Bug reporting
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1206 (defun octave-submit-bug-report ()
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1207 "Submit a bug report on the Emacs Octave package via mail."
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1208 (interactive)
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1209 (require 'reporter)
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1210 (and
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1211 (y-or-n-p "Do you want to submit a bug report? ")
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1212 (reporter-submit-bug-report
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1213 octave-maintainer-address
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1214 (concat "Emacs version " emacs-version)
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1215 (list
20181
fe0f0a9bb43f (octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 17533
diff changeset
1216 'octave-auto-indent
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1217 'octave-auto-newline
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1218 'octave-blink-matching-block
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1219 'octave-block-offset
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1220 'octave-comment-char
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1221 'octave-continuation-offset
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1222 'octave-continuation-string
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1223 'octave-send-echo-input
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1224 'octave-send-line-auto-forward
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1225 'octave-send-show-buffer))))
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1226
94496
38eb904fa638 * progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1227 ;; provide ourself
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1228
16911
123d19079d9f Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents: 16905
diff changeset
1229 (provide 'octave-mod)
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1230
84655
4c09574b3527 Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78487
diff changeset
1231 ;; arch-tag: 05f1ce09-be87-4c00-803e-4919ffa26c23
16905
a93836c8b52b Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents: 16902
diff changeset
1232 ;;; octave-mod.el ends here