Mercurial > emacs
annotate lisp/progmodes/octave-mod.el @ 112312:b9b02605a4af
* configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 08 Jan 2011 23:40:01 -0800 |
parents | b47e85affa59 |
children | 417b1e4d63cd |
rev | line source |
---|---|
17517 | 1 ;;; octave-mod.el --- editing Octave source files under Emacs |
16901 | 2 |
111470
66c9a8999fbb
* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.
Glenn Morris <rgm@gnu.org>
parents:
111440
diff
changeset
|
3 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
66c9a8999fbb
* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.
Glenn Morris <rgm@gnu.org>
parents:
111440
diff
changeset
|
4 ;; 2009, 2010 Free Software Foundation, Inc. |
16901 | 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 | 9 ;; Keywords: languages |
10 | |
11 ;; This file is part of GNU Emacs. | |
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 | 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 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
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 | 25 |
26 ;;; Commentary: | |
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 | 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 | 40 |
20781 | 41 (defgroup octave nil |
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 | 44 :group 'languages) |
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 | 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 | 207 :type 'string |
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 | 213 (let ((map (make-sparse-keymap))) |
214 (define-key map "`" 'octave-abbrev-start) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
215 (define-key map "\e\n" 'octave-indent-new-comment-line) |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
216 (define-key map "\M-\C-q" 'octave-indent-defun) |
16901 | 217 (define-key map "\C-c\C-b" 'octave-submit-bug-report) |
218 (define-key map "\C-c\C-p" 'octave-previous-code-line) | |
219 (define-key map "\C-c\C-n" 'octave-next-code-line) | |
220 (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
|
221 (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
|
222 (define-key map [remap down-list] 'smie-down-list) |
16901 | 223 (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
|
224 (define-key map "\C-c]" 'smie-close-block) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
225 (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
|
226 (define-key map "\C-c\C-f" 'octave-insert-defun) |
16901 | 227 (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
|
228 (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
|
229 (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
|
230 (define-key map "\C-c\C-if" 'octave-send-defun) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
231 (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
|
232 (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
|
233 (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
|
234 (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
|
235 (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
|
236 (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
|
237 (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
|
238 (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
|
239 (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
|
240 (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
|
241 (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
|
242 map) |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
243 "Keymap used in Octave mode.") |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
244 |
16901 | 245 |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
246 |
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
247 (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
|
248 "Menu for Octave mode." |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
249 '("Octave" |
98358
393e8f885464
(octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents:
94673
diff
changeset
|
250 ("Lines" |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
251 ["Previous Code Line" octave-previous-code-line t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
252 ["Next Code Line" octave-next-code-line t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
253 ["Begin of Continuation" octave-beginning-of-line t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
254 ["End of Continuation" octave-end-of-line t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
255 ["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
|
256 ("Blocks" |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
257 ["Mark Block" octave-mark-block t] |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
258 ["Close Block" smie-close-block t]) |
98358
393e8f885464
(octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents:
94673
diff
changeset
|
259 ("Functions" |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
260 ["Indent Function" octave-indent-defun t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
261 ["Insert Function" octave-insert-defun t]) |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
262 "-" |
98358
393e8f885464
(octave-mode-menu): Fix incorrect quoting.
Chong Yidong <cyd@stupidchicken.com>
parents:
94673
diff
changeset
|
263 ("Debug" |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
264 ["Send Current Line" octave-send-line t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
265 ["Send Current Block" octave-send-block t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
266 ["Send Current Function" octave-send-defun t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
267 ["Send Region" octave-send-region t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
268 ["Show Process Buffer" octave-show-process-buffer t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
269 ["Hide Process Buffer" octave-hide-process-buffer t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
270 ["Kill Process" octave-kill-process t]) |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
271 "-" |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
272 ["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
|
273 ["Complete Symbol" completion-at-point t] |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
274 "-" |
109842
ecdbd21826de
* lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109815
diff
changeset
|
275 ["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
|
276 :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
|
277 ["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
|
278 :style toggle :selected auto-fill-function] |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
279 "-" |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
280 ["Submit Bug Report" octave-submit-bug-report t] |
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
281 "-" |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
282 ["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
|
283 ["Lookup Octave Index" info-lookup-symbol t])) |
16901 | 284 |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
285 (defvar octave-mode-syntax-table |
16901 | 286 (let ((table (make-syntax-table))) |
287 (modify-syntax-entry ?\r " " table) | |
288 (modify-syntax-entry ?+ "." table) | |
289 (modify-syntax-entry ?- "." table) | |
290 (modify-syntax-entry ?= "." table) | |
291 (modify-syntax-entry ?* "." table) | |
292 (modify-syntax-entry ?/ "." table) | |
293 (modify-syntax-entry ?> "." table) | |
294 (modify-syntax-entry ?< "." table) | |
295 (modify-syntax-entry ?& "." table) | |
296 (modify-syntax-entry ?| "." table) | |
297 (modify-syntax-entry ?! "." table) | |
298 (modify-syntax-entry ?\\ "\\" table) | |
299 (modify-syntax-entry ?\' "." table) | |
94565
fe81b2cb42e0
(octave-abbrev-table): Move defvar and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94496
diff
changeset
|
300 ;; 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
|
301 (modify-syntax-entry ?\` "." table) |
16901 | 302 (modify-syntax-entry ?\" "\"" table) |
303 (modify-syntax-entry ?. "w" table) | |
304 (modify-syntax-entry ?_ "w" table) | |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109755
diff
changeset
|
305 ;; 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
|
306 ;; 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
|
307 ;; 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
|
308 ;; 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
|
309 ;; 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
|
310 ;; 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
|
311 (modify-syntax-entry ?\% "< 13" table) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
312 (modify-syntax-entry ?\# "< 13" table) |
109757
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109755
diff
changeset
|
313 (modify-syntax-entry ?\{ "(} 2c" table) |
818e325e0469
Introduce a new comment style "c" flag.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109755
diff
changeset
|
314 (modify-syntax-entry ?\} "){ 4c" table) |
16901 | 315 (modify-syntax-entry ?\n ">" table) |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
316 table) |
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
317 "Syntax table in use in `octave-mode' buffers.") |
16901 | 318 |
20781 | 319 (defcustom octave-blink-matching-block t |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
320 "Control the blinking of matching Octave block keywords. |
16901 | 321 Non-nil means show matching begin of block when inserting a space, |
20781 | 322 newline or semicolon after an else or end keyword." |
323 :type 'boolean | |
324 :group 'octave) | |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
325 |
20781 | 326 (defcustom octave-block-offset 2 |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
327 "Extra indentation applied to statements in Octave block structures." |
20781 | 328 :type 'integer |
329 :group 'octave) | |
16901 | 330 |
331 (defvar octave-block-comment-start | |
332 (concat (make-string 2 octave-comment-char) " ") | |
333 "String to insert to start a new Octave comment on an empty line.") | |
334 | |
20781 | 335 (defcustom octave-continuation-offset 4 |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
336 "Extra indentation applied to Octave continuation lines." |
20781 | 337 :type 'integer |
338 :group 'octave) | |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
339 (eval-and-compile |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
340 (defconst octave-continuation-marker-regexp "\\\\\\|\\.\\.\\.")) |
16901 | 341 (defvar octave-continuation-regexp |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
342 (concat "[^#%\n]*\\(" octave-continuation-marker-regexp |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
343 "\\)\\s-*\\(\\s<.*\\)?$")) |
20781 | 344 (defcustom octave-continuation-string "\\" |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
345 "Character string used for Octave continuation lines. Normally \\." |
20781 | 346 :type 'string |
347 :group 'octave) | |
16901 | 348 |
349 (defvar octave-completion-alist nil | |
350 "Alist of Octave symbols for completion in Octave mode. | |
351 Each element looks like (VAR . VAR), where the car and cdr are the same | |
352 symbol (an Octave command or variable name). | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
353 Currently, only builtin variables can be completed.") |
16901 | 354 |
355 (defvar octave-mode-imenu-generic-expression | |
356 (list | |
357 ;; Functions | |
358 (list nil octave-function-header-regexp 3)) | |
359 "Imenu expression for Octave mode. See `imenu-generic-expression'.") | |
360 | |
20781 | 361 (defcustom octave-mode-hook nil |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
362 "Hook to be run when Octave mode is started." |
20781 | 363 :type 'hook |
364 :group 'octave) | |
16901 | 365 |
20781 | 366 (defcustom octave-send-show-buffer t |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
367 "Non-nil means display `inferior-octave-buffer' after sending to it." |
20781 | 368 :type 'boolean |
369 :group 'octave) | |
370 (defcustom octave-send-line-auto-forward t | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
371 "Control auto-forward after sending to the inferior Octave process. |
20781 | 372 Non-nil means always go to the next Octave code line after sending." |
373 :type 'boolean | |
374 :group 'octave) | |
375 (defcustom octave-send-echo-input t | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
376 "Non-nil means echo input sent to the inferior Octave process." |
20781 | 377 :type 'boolean |
378 :group 'octave) | |
16901 | 379 |
380 | |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
381 ;;; SMIE indentation |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
382 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
383 (require 'smie) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
384 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
385 (defconst octave-operator-table |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
386 '((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
|
387 (right "=" "+=" "-=" "*=" "/=") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
388 (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
|
389 (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
|
390 (nonassoc "<" "<=" "==" ">=" ">" "!=" "~=") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
391 (nonassoc ":") ;No idea what this is. |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
392 (assoc "+" "-") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
393 (assoc "*" "/" "\\" ".\\" ".*" "./") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
394 (nonassoc "'" ".'") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
395 (nonassoc "++" "--" "!" "~") ;And unary "+" and "-". |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
396 (right "^" "**" ".^" ".**") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
397 ;; 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
|
398 ;; could be convenient to treat it as one. |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
399 (assoc "..."))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
400 |
110164
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
401 (defconst octave-smie-bnf-table |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
402 '((atom) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
403 ;; 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
|
404 ;; 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
|
405 ;; 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
|
406 ;; 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
|
407 (exp (exp "\n" exp) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
408 ;; 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
|
409 ;; 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
|
410 ;; 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
|
411 (exp ";" exp) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
412 ("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
|
413 ("try" exp "catch" exp "end") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
414 ("unwind_protect" exp |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
415 "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
|
416 ("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
|
417 ("for" exp "endfor") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
418 ("for" exp "end") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
419 ("do" exp "until" atom) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
420 ("while" exp "endwhile") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
421 ("while" exp "end") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
422 ("if" exp "endif") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
423 ("if" exp "else" exp "endif") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
424 ("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
|
425 ("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
|
426 ("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
|
427 ("switch" exp "case" exp "endswitch") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
428 ("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
|
429 ("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
|
430 ("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
|
431 ("function" exp "endfunction") |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
432 ("function" exp "end")) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
433 ;; (fundesc (atom "=" atom)) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
434 )) |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
435 |
111440
b72ff43b041f
* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111232
diff
changeset
|
436 (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
|
437 (smie-prec2->grammar |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
438 (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
|
439 (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
|
440 '((assoc "\n" ";"))) |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
441 |
111440
b72ff43b041f
* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111232
diff
changeset
|
442 (smie-precs->prec2 octave-operator-table)))) |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
443 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
444 ;; 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
|
445 ;; 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
|
446 ;; corresponding continuation lines). |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
447 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
448 (defconst octave-operator-regexp |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
449 (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
|
450 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
451 (defun octave-smie-backward-token () |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
452 (let ((pos (point))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
453 (forward-comment (- (point))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
454 (cond |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
455 ((and (not (eq (char-before) ?\;)) ;Coalesce ";" and "\n". |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
456 (> pos (line-end-position)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
457 (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
|
458 (progn |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
459 (goto-char (match-beginning 0)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
460 (forward-comment (- (point))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
461 nil) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
462 t) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
463 ;; Ignore it if it's within parentheses. |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
464 (let ((ppss (syntax-ppss))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
465 (not (and (nth 1 ppss) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
466 (eq ?\( (char-after (nth 1 ppss))))))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
467 (skip-chars-forward " \t") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
468 ;; Why bother distinguishing \n and ;? |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
469 ";") ;;"\n" |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
470 ((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
|
471 ;; 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
|
472 (not (looking-back "\\s\"" (1- (point))))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
473 (goto-char (match-beginning 0)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
474 (match-string-no-properties 0)) |
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 (smie-default-backward-token))))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
477 |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
478 (defun octave-smie-forward-token () |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
479 (skip-chars-forward " \t") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
480 (when (looking-at (eval-when-compile |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
481 (concat "\\(" octave-continuation-marker-regexp |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
482 "\\)[ \t]*\\($\\|[%#]\\)"))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
483 (goto-char (match-end 1)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
484 (forward-comment 1)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
485 (cond |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
486 ((and (looking-at "$\\|[%#]") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
487 ;; Ignore it if it's within parentheses. |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
488 (prog1 (let ((ppss (syntax-ppss))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
489 (not (and (nth 1 ppss) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
490 (eq ?\( (char-after (nth 1 ppss)))))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
491 (forward-comment (point-max)))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
492 ;; Why bother distinguishing \n and ;? |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
493 ";") ;;"\n" |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
494 ((looking-at ";[ \t]*\\($\\|[%#]\\)") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
495 ;; Combine the ; with the subsequent \n. |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
496 (goto-char (match-beginning 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 ";") |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
499 ((and (looking-at octave-operator-regexp) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
500 ;; 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
|
501 (not (looking-at "\\s\""))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
502 (goto-char (match-end 0)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
503 (match-string-no-properties 0)) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
504 (t |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
505 (smie-default-forward-token)))) |
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
506 |
111232
a9904c1962db
SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111205
diff
changeset
|
507 (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
|
508 (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
|
509 ;; 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
|
510 ;; disadvantages: |
b72ff43b041f
* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111232
diff
changeset
|
511 ;; - 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
|
512 ;; - 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
|
513 (`(: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
|
514 ;; 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
|
515 ;; 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
|
516 (`(: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
|
517 (`(: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
|
518 (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
|
519 "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
|
520 "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
|
521 (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
|
522 ;; 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
|
523 ;; (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
|
524 0)))) |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
525 |
111562
97341bc31847
* lisp/progmodes/octave-mod.el: Rely on elecric-*-modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111470
diff
changeset
|
526 (defvar electric-layout-rules) |
110270
c7809974cd64
Misc cleanups and simplifications.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110164
diff
changeset
|
527 |
16901 | 528 ;;;###autoload |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
529 (define-derived-mode octave-mode prog-mode "Octave" |
16901 | 530 "Major mode for editing Octave code. |
531 | |
532 This mode makes it easier to write Octave code by helping with | |
533 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
|
534 showing keywords, comments, strings, etc. in different faces (with |
16901 | 535 Font Lock mode on terminals that support it). |
536 | |
537 Octave itself is a high-level language, primarily intended for numerical | |
538 computations. It provides a convenient command line interface for | |
539 solving linear and nonlinear problems numerically. Function definitions | |
540 can also be stored in files, and it can be used in a batch mode (which | |
541 is why you need this mode!). | |
542 | |
543 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
|
544 ftp from ftp.octave.org in the directory `/pub/octave'. Complete |
16901 | 545 source and binaries for several popular systems are available. |
546 | |
547 Type \\[list-abbrevs] to display the built-in abbrevs for Octave keywords. | |
548 | |
549 Keybindings | |
550 =========== | |
551 | |
552 \\{octave-mode-map} | |
553 | |
554 Variables you can use to customize Octave mode | |
555 ============================================== | |
556 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
557 `octave-blink-matching-block' |
16901 | 558 Non-nil means show matching begin of block when inserting a space, |
559 newline or semicolon after an else or end keyword. Default is t. | |
560 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
561 `octave-block-offset' |
16901 | 562 Extra indentation applied to statements in block structures. |
563 Default is 2. | |
564 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
565 `octave-continuation-offset' |
16901 | 566 Extra indentation applied to Octave continuation lines. |
567 Default is 4. | |
568 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
569 `octave-continuation-string' |
16901 | 570 String used for Octave continuation lines. |
571 Default is a backslash. | |
572 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
573 `octave-send-echo-input' |
16901 | 574 Non-nil means always display `inferior-octave-buffer' after sending a |
575 command to the inferior Octave process. | |
576 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
577 `octave-send-line-auto-forward' |
16901 | 578 Non-nil means always go to the next unsent line of Octave code after |
579 sending a line to the inferior Octave process. | |
580 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
581 `octave-send-echo-input' |
16901 | 582 Non-nil means echo input sent to the inferior Octave process. |
583 | |
584 Turning on Octave mode runs the hook `octave-mode-hook'. | |
585 | |
586 To begin using this mode for all `.m' files that you edit, add the | |
587 following lines to your `.emacs' file: | |
588 | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
589 (add-to-list 'auto-mode-alist '(\"\\\\.m\\\\'\" . octave-mode)) |
16901 | 590 |
85052
c25dd5c18af4
John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents:
84655
diff
changeset
|
591 To automatically turn on the abbrev and auto-fill features, |
16901 | 592 add the following lines to your `.emacs' file as well: |
593 | |
594 (add-hook 'octave-mode-hook | |
595 (lambda () | |
596 (abbrev-mode 1) | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
597 (auto-fill-mode 1))) |
16901 | 598 |
599 To submit a problem report, enter \\[octave-submit-bug-report] from \ | |
600 an Octave mode buffer. | |
601 This automatically sets up a mail buffer with version information | |
602 already added. You just need to add a description of the problem, | |
603 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
|
604 (setq local-abbrev-table octave-abbrev-table) |
16901 | 605 |
111440
b72ff43b041f
* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111232
diff
changeset
|
606 (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
|
607 :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
|
608 :backward-token #'octave-smie-backward-token) |
110038
6939db1ee97b
Use SMIE for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109842
diff
changeset
|
609 (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
|
610 |
da442f29c7b6
Use SMIE's blink-paren for octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110066
diff
changeset
|
611 (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
|
612 (cons ?\; smie-blink-matching-triggers)) |
a9904c1962db
SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111205
diff
changeset
|
613 (unless octave-blink-matching-block |
a9904c1962db
SMIE: change indent rules format, improve smie-setup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111205
diff
changeset
|
614 (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
|
615 |
111205
e6399f46aefa
* lisp/electric.el (electric-indent-chars): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110802
diff
changeset
|
616 (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
|
617 (cons ?\; electric-indent-chars)) |
111562
97341bc31847
* lisp/progmodes/octave-mod.el: Rely on elecric-*-modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111470
diff
changeset
|
618 ;; IIUC matlab-mode takes the opposite approach: it makes RET insert |
97341bc31847
* lisp/progmodes/octave-mod.el: Rely on elecric-*-modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111470
diff
changeset
|
619 ;; a ";" at those places where it's correct (i.e. outside of parens). |
97341bc31847
* lisp/progmodes/octave-mod.el: Rely on elecric-*-modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111470
diff
changeset
|
620 (set (make-local-variable 'electric-layout-rules) '((?\; . after))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
621 |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
622 (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
|
623 (set (make-local-variable 'comment-end) "") |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
624 ;; 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
|
625 ;; 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
|
626 ;; (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
|
627 (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
|
628 (set (make-local-variable 'comment-add) 1) |
16901 | 629 |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
630 (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
|
631 (set (make-local-variable 'paragraph-start) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
632 (concat "\\s-*$\\|" page-delimiter)) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
633 (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
|
634 (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
|
635 (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
|
636 ;; FIXME: Why disable it? |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
637 ;; (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
|
638 ;; 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
|
639 ;; (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
|
640 (set (make-local-variable 'normal-auto-fill-function) 'octave-auto-fill) |
16901 | 641 |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
642 (set (make-local-variable 'font-lock-defaults) |
110305
b10051866f51
New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110270
diff
changeset
|
643 '(octave-font-lock-keywords)) |
b10051866f51
New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110270
diff
changeset
|
644 |
b10051866f51
New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110270
diff
changeset
|
645 (set (make-local-variable 'syntax-propertize-function) |
b10051866f51
New syntax-propertize functionality.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110270
diff
changeset
|
646 #'octave-syntax-propertize-function) |
16901 | 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 'imenu-generic-expression) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
649 octave-mode-imenu-generic-expression) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
650 (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
|
651 |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
652 (add-hook 'completion-at-point-functions |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
653 '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
|
654 (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
|
655 'octave-beginning-of-defun) |
16901 | 656 |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
657 (easy-menu-add octave-mode-menu) |
111870
b47e85affa59
Derive from prog-mode, use derived-mode-p, and fix up various
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111562
diff
changeset
|
658 (octave-initialize-completions)) |
94496
38eb904fa638
* progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
659 |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
660 (defvar info-lookup-mode) |
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
661 |
94496
38eb904fa638
* progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
662 (defun octave-help () |
38eb904fa638
* progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
663 "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
|
664 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
|
665 (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
|
666 (call-interactively 'info-lookup-symbol))) |
16901 | 667 |
668 ;;; Miscellaneous useful functions | |
669 | |
670 (defsubst octave-in-comment-p () | |
78487
419c5c316b51
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
671 "Return t if point is inside an Octave comment." |
16901 | 672 (save-excursion |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
673 ;; FIXME: use syntax-ppss? |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
674 (nth 4 (parse-partial-sexp (line-beginning-position) (point))))) |
16901 | 675 |
676 (defsubst octave-in-string-p () | |
78487
419c5c316b51
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78234
diff
changeset
|
677 "Return t if point is inside an Octave string." |
16901 | 678 (save-excursion |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
679 ;; FIXME: use syntax-ppss? |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
680 (nth 3 (parse-partial-sexp (line-beginning-position) (point))))) |
16901 | 681 |
682 (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
|
683 "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
|
684 ;; FIXME: Use syntax-ppss? |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
685 (let ((pps (parse-partial-sexp (line-beginning-position) (point)))) |
16901 | 686 (not (or (nth 3 pps) (nth 4 pps))))) |
687 | |
688 | |
79070
b5a52e129c97
John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents:
78487
diff
changeset
|
689 (defun octave-looking-at-kw (regexp) |
79072
c766bbd72b1d
(octave-looking-at-kw): Add doc string.
Glenn Morris <rgm@gnu.org>
parents:
79070
diff
changeset
|
690 "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
|
691 (let ((case-fold-search nil)) |
b5a52e129c97
John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents:
78487
diff
changeset
|
692 (looking-at regexp))) |
b5a52e129c97
John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents:
78487
diff
changeset
|
693 |
20181
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
694 (defun octave-maybe-insert-continuation-string () |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
695 (if (or (octave-in-comment-p) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
696 (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
697 (beginning-of-line) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
698 (looking-at octave-continuation-regexp))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
699 nil |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
700 (delete-horizontal-space) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
701 (insert (concat " " octave-continuation-string)))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
702 |
16901 | 703 |
704 ;;; Indentation | |
705 | |
706 (defun octave-indent-new-comment-line () | |
707 "Break Octave line at point, continuing comment if within one. | |
708 If within code, insert `octave-continuation-string' before breaking the | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
709 line. If within a string, signal an error. |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
710 The new line is properly indented." |
16901 | 711 (interactive) |
712 (delete-horizontal-space) | |
713 (cond | |
714 ((octave-in-comment-p) | |
715 (indent-new-comment-line)) | |
716 ((octave-in-string-p) | |
717 (error "Cannot split a code line inside a string")) | |
718 (t | |
719 (insert (concat " " octave-continuation-string)) | |
111562
97341bc31847
* lisp/progmodes/octave-mod.el: Rely on elecric-*-modes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
111470
diff
changeset
|
720 (reindent-then-newline-and-indent)))) |
16901 | 721 |
722 (defun octave-indent-defun () | |
84655
4c09574b3527
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78487
diff
changeset
|
723 "Properly indent the Octave function which contains point." |
16901 | 724 (interactive) |
725 (save-excursion | |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
726 (mark-defun) |
16901 | 727 (message "Indenting function...") |
728 (indent-region (point) (mark) nil)) | |
729 (message "Indenting function...done.")) | |
730 | |
731 | |
732 ;;; Motion | |
733 (defun octave-next-code-line (&optional arg) | |
734 "Move ARG lines of Octave code forward (backward if ARG is negative). | |
735 Skips past all empty and comment lines. Default for ARG is 1. | |
736 | |
737 On success, return 0. Otherwise, go as far as possible and return -1." | |
738 (interactive "p") | |
739 (or arg (setq arg 1)) | |
740 (beginning-of-line) | |
741 (let ((n 0) | |
742 (inc (if (> arg 0) 1 -1))) | |
743 (while (and (/= arg 0) (= n 0)) | |
744 (setq n (forward-line inc)) | |
745 (while (and (= n 0) | |
746 (looking-at "\\s-*\\($\\|\\s<\\)")) | |
747 (setq n (forward-line inc))) | |
748 (setq arg (- arg inc))) | |
749 n)) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
750 |
16901 | 751 (defun octave-previous-code-line (&optional arg) |
752 "Move ARG lines of Octave code backward (forward if ARG is negative). | |
753 Skips past all empty and comment lines. Default for ARG is 1. | |
754 | |
755 On success, return 0. Otherwise, go as far as possible and return -1." | |
756 (interactive "p") | |
757 (or arg (setq arg 1)) | |
758 (octave-next-code-line (- arg))) | |
759 | |
760 (defun octave-beginning-of-line () | |
761 "Move point to beginning of current Octave line. | |
762 If on an empty or comment line, go to the beginning of that line. | |
763 Otherwise, move backward to the beginning of the first Octave code line | |
764 which is not inside a continuation statement, i.e., which does not | |
765 follow a code line ending in `...' or `\\', or is inside an open | |
766 parenthesis list." | |
767 (interactive) | |
768 (beginning-of-line) | |
769 (if (not (looking-at "\\s-*\\($\\|\\s<\\)")) | |
770 (while (or (condition-case nil | |
771 (progn | |
772 (up-list -1) | |
773 (beginning-of-line) | |
774 t) | |
775 (error nil)) | |
776 (and (or (looking-at "\\s-*\\($\\|\\s<\\)") | |
777 (save-excursion | |
778 (if (zerop (octave-previous-code-line)) | |
779 (looking-at octave-continuation-regexp)))) | |
780 (zerop (forward-line -1))))))) | |
781 | |
782 (defun octave-end-of-line () | |
783 "Move point to end of current Octave line. | |
784 If on an empty or comment line, go to the end of that line. | |
785 Otherwise, move forward to the end of the first Octave code line which | |
786 does not end in `...' or `\\' or is inside an open parenthesis list." | |
787 (interactive) | |
788 (end-of-line) | |
789 (if (save-excursion | |
790 (beginning-of-line) | |
791 (looking-at "\\s-*\\($\\|\\s<\\)")) | |
792 () | |
793 (while (or (condition-case nil | |
794 (progn | |
795 (up-list 1) | |
796 (end-of-line) | |
797 t) | |
798 (error nil)) | |
799 (and (save-excursion | |
800 (beginning-of-line) | |
801 (or (looking-at "\\s-*\\($\\|\\s<\\)") | |
802 (looking-at octave-continuation-regexp))) | |
803 (zerop (forward-line 1))))) | |
804 (end-of-line))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
805 |
16901 | 806 (defun octave-mark-block () |
807 "Put point at the beginning of this Octave block, mark at the end. | |
808 The block marked is the one that contains point or follows point." | |
809 (interactive) | |
110066
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
810 (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
|
811 (save-excursion |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
812 (let* ((token (funcall smie-forward-token-function)) |
111470
66c9a8999fbb
* lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change.
Glenn Morris <rgm@gnu.org>
parents:
111440
diff
changeset
|
813 (level (assoc token smie-grammar))) |
110066
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
814 (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
|
815 (backward-up-list 1)) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
816 (mark-sexp)) |
16901 | 817 |
818 (defun octave-beginning-of-defun (&optional arg) | |
819 "Move backward to the beginning of an Octave function. | |
820 With positive ARG, do it that many times. Negative argument -N means | |
821 move forward to Nth following beginning of a function. | |
822 Returns t unless search stops at the beginning or end of the buffer." | |
823 (let* ((arg (or arg 1)) | |
824 (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
|
825 (found nil) |
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
826 (case-fold-search nil)) |
16901 | 827 (and (not (eobp)) |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
828 (not (and (> arg 0) (looking-at "\\<function\\>"))) |
16901 | 829 (skip-syntax-forward "w")) |
830 (while (and (/= arg 0) | |
831 (setq found | |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
832 (re-search-backward "\\<function\\>" inc))) |
16901 | 833 (if (octave-not-in-string-or-comment-p) |
834 (setq arg (- arg inc)))) | |
835 (if found | |
836 (progn | |
837 (and (< inc 0) (goto-char (match-beginning 0))) | |
838 t)))) | |
839 | |
840 | |
841 ;;; Filling | |
842 (defun octave-auto-fill () | |
20181
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
843 "Perform auto-fill in Octave mode. |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
844 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
|
845 otherwise." |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
846 (let (fc give-up) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
847 (if (or (null (setq fc (current-fill-column))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
848 (save-excursion |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
849 (beginning-of-line) |
20181
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
850 (and auto-fill-inhibit-regexp |
79070
b5a52e129c97
John W. Eaton <jwe at octave.org>
Glenn Morris <rgm@gnu.org>
parents:
78487
diff
changeset
|
851 (octave-looking-at-kw auto-fill-inhibit-regexp)))) |
20181
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
852 nil ; Can't do anything |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
853 (if (and (not (octave-in-comment-p)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
854 (> (current-column) fc)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
855 (setq fc (- fc (+ (length octave-continuation-string) 1)))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
856 (while (and (not give-up) (> (current-column) fc)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
857 (let* ((opoint (point)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
858 (fpoint |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
859 (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
860 (move-to-column (+ fc 1)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
861 (skip-chars-backward "^ \t\n") |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
862 ;; 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
|
863 ;; the first word |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
864 (if (bolp) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
865 (re-search-forward "[ \t]" opoint t)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
866 ;; 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
|
867 ;; comment chars |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
868 (if (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
869 (skip-syntax-backward " <") |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
870 (bolp)) |
52930
069cb76731fd
(octave-comment-start): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
871 (re-search-forward "[ \t]" (line-end-position) |
20181
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
872 'move)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
873 ;; 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
|
874 ;; continuation string, don't break here. |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
875 (if (and (not (octave-in-comment-p)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
876 (looking-at |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
877 (concat "\\s-*" |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
878 (regexp-quote |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
879 octave-continuation-string) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
880 "\\s-*$"))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
881 (end-of-line)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
882 (skip-chars-backward " \t") |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
883 (point)))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
884 (if (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
885 (goto-char fpoint) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
886 (not (or (bolp) (eolp)))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
887 (let ((prev-column (current-column))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
888 (if (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
889 (skip-chars-backward " \t") |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
890 (= (point) fpoint)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
891 (progn |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
892 (octave-maybe-insert-continuation-string) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
893 (indent-new-comment-line t)) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
894 (save-excursion |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
895 (goto-char fpoint) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
896 (octave-maybe-insert-continuation-string) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
897 (indent-new-comment-line t))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
898 (if (>= (current-column) prev-column) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
899 (setq give-up t))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
900 (setq give-up t)))) |
fe0f0a9bb43f
(octave-auto-indent): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
17533
diff
changeset
|
901 (not give-up)))) |
16901 | 902 |
903 (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
|
904 "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
|
905 ;; 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
|
906 ;; - 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
|
907 ;; - \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
|
908 ;; - 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
|
909 (interactive "P") |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
910 (save-excursion |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
911 (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
|
912 (beg (progn |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
913 (forward-paragraph -1) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
914 (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
|
915 (beginning-of-line) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
916 (point))) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
917 (cfc (current-fill-column)) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
918 comment-prefix) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
919 (goto-char beg) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
920 (while (< (point) end) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
921 (condition-case nil |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
922 (indent-according-to-mode) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
923 (error nil)) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
924 (move-to-column cfc) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
925 ;; 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
|
926 (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
|
927 (octave-in-comment-p) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
928 (not (save-excursion |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
929 (beginning-of-line) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
930 (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
|
931 ;; 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
|
932 ;; 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
|
933 ;; 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
|
934 ;; 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
|
935 ;; 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
|
936 (progn |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
937 ;; Get the comment prefix |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
938 (save-excursion |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
939 (beginning-of-line) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
940 (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
|
941 (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
|
942 (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
|
943 ;; And keep combining ... |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
944 (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
|
945 (save-excursion |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
946 (forward-line 1) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
947 (and (looking-at |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
948 (concat "^\\s-*" |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
949 comment-prefix |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
950 "\\S<")) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
951 (not (looking-at |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
952 (concat "^\\s-*" |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
953 comment-prefix |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
954 "\\s-*$")))))) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
955 (delete-char 1) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
956 (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
|
957 (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
|
958 (fixup-whitespace) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
959 (move-to-column cfc)))) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
960 ;; 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
|
961 ;; some other time ... |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
962 (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
|
963 (delete-horizontal-space) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
964 (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
|
965 (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
|
966 (forward-line 1) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
967 (if (not (eolp)) (insert " ")) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
968 (or (octave-auto-fill) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
969 (forward-line 1)))) |
5ef877197e04
Remove old indentation and navigation code on octave-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
110038
diff
changeset
|
970 t))) |
16901 | 971 |
972 | |
973 ;;; Completions | |
974 (defun octave-initialize-completions () | |
975 "Create an alist for Octave completions." | |
976 (if octave-completion-alist | |
977 () | |
978 (setq octave-completion-alist | |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
979 (append octave-reserved-words |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
980 octave-text-functions |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
981 octave-variables)))) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
982 |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
983 (defun octave-completion-at-point-function () |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
984 "Find the text to complete and the corresponding table." |
109755
1aa7bc345918
Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109754
diff
changeset
|
985 (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
|
986 (end (point))) |
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
987 (if (< beg (point)) |
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
988 ;; 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
|
989 (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
|
990 (setq end (max end (point))))) |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
991 (list beg end octave-completion-alist))) |
16901 | 992 |
993 (defun octave-complete-symbol () | |
994 "Perform completion on Octave symbol preceding point. | |
995 Compare that symbol against Octave's reserved words and builtin | |
996 variables." | |
997 (interactive) | |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
998 (apply 'completion-in-region (octave-completion-at-point-function))) |
16901 | 999 |
1000 ;;; Electric characters && friends | |
1001 | |
1002 (defun octave-abbrev-start () | |
1003 "Start entering an Octave abbreviation. | |
1004 If Abbrev mode is turned on, typing ` (grave accent) followed by ? or | |
1005 \\[help-command] lists all Octave abbrevs. Any other key combination is | |
1006 executed normally. | |
1007 Note that all Octave mode abbrevs start with a grave accent." | |
1008 (interactive) | |
1009 (if (not abbrev-mode) | |
1010 (self-insert-command 1) | |
1011 (let (c) | |
101002
3b3c7e10cd97
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1012 (insert last-command-event) |
85511
f873840f9fea
* emulation/edt-mapper.el (function-key-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85277
diff
changeset
|
1013 (if (if (featurep 'xemacs) |
23848
7896e341d77f
(octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
1014 (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
|
1015 (eq (event-to-character c) help-char)) |
7896e341d77f
(octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
1016 (or (eq (setq c (read-event)) ??) |
7896e341d77f
(octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
1017 (eq c help-char))) |
7896e341d77f
(octave-abbrev-start): Use the correct
Karl Heuer <kwzh@gnu.org>
parents:
21669
diff
changeset
|
1018 (let ((abbrev-table-name-list '(octave-abbrev-table))) |
16901 | 1019 (list-abbrevs)) |
1020 (setq unread-command-events (list c)))))) | |
1021 | |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1022 (define-skeleton octave-insert-defun |
16901 | 1023 "Insert an Octave function skeleton. |
1024 Prompt for the function's name, arguments and return values (to be | |
1025 entered without parens)." | |
109754
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1026 (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
|
1027 (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
|
1028 nil nil defname)) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1029 (args (read-string "Arguments: ")) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1030 (vals (read-string "Return values: "))) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1031 (format "%s%s (%s)" |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1032 (cond |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1033 ((string-equal vals "") vals) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1034 ((string-match "[ ,]" vals) (concat "[" vals "] = ")) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1035 (t (concat vals " = "))) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1036 name |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1037 args)) |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1038 \n "function " > str \n \n |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1039 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
|
1040 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
|
1041 \n _ \n |
47ffebe76e42
Misc code cleanup of octave-mode.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109753
diff
changeset
|
1042 "endfunction" > \n) |
16901 | 1043 |
1044 ;;; Communication with the inferior Octave process | |
1045 (defun octave-kill-process () | |
1046 "Kill inferior Octave process and its buffer." | |
1047 (interactive) | |
1048 (if inferior-octave-process | |
1049 (progn | |
1050 (process-send-string inferior-octave-process "quit;\n") | |
1051 (accept-process-output inferior-octave-process))) | |
1052 (if inferior-octave-buffer | |
1053 (kill-buffer inferior-octave-buffer))) | |
1054 | |
1055 (defun octave-show-process-buffer () | |
1056 "Make sure that `inferior-octave-buffer' is displayed." | |
1057 (interactive) | |
1058 (if (get-buffer inferior-octave-buffer) | |
1059 (display-buffer inferior-octave-buffer) | |
1060 (message "No buffer named %s" inferior-octave-buffer))) | |
1061 | |
1062 (defun octave-hide-process-buffer () | |
1063 "Delete all windows that display `inferior-octave-buffer'." | |
1064 (interactive) | |
1065 (if (get-buffer inferior-octave-buffer) | |
1066 (delete-windows-on inferior-octave-buffer) | |
1067 (message "No buffer named %s" inferior-octave-buffer))) | |
1068 | |
1069 (defun octave-send-region (beg end) | |
1070 "Send current region to the inferior Octave process." | |
1071 (interactive "r") | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
1072 (inferior-octave t) |
16901 | 1073 (let ((proc inferior-octave-process) |
1074 (string (buffer-substring-no-properties beg end)) | |
1075 line) | |
94496
38eb904fa638
* progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1076 (with-current-buffer inferior-octave-buffer |
16901 | 1077 (setq inferior-octave-output-list nil) |
1078 (while (not (string-equal string "")) | |
1079 (if (string-match "\n" string) | |
1080 (setq line (substring string 0 (match-beginning 0)) | |
1081 string (substring string (match-end 0))) | |
1082 (setq line string string "")) | |
1083 (setq inferior-octave-receive-in-progress t) | |
1084 (inferior-octave-send-list-and-digest (list (concat line "\n"))) | |
1085 (while inferior-octave-receive-in-progress | |
1086 (accept-process-output proc)) | |
1087 (insert-before-markers | |
1088 (mapconcat 'identity | |
1089 (append | |
1090 (if octave-send-echo-input (list line) (list "")) | |
1091 (mapcar 'inferior-octave-strip-ctrl-g | |
1092 inferior-octave-output-list) | |
1093 (list inferior-octave-output-string)) | |
1094 "\n"))))) | |
1095 (if octave-send-show-buffer | |
1096 (display-buffer inferior-octave-buffer))) | |
1097 | |
1098 (defun octave-send-block () | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
1099 "Send current Octave block to the inferior Octave process." |
16901 | 1100 (interactive) |
1101 (save-excursion | |
1102 (octave-mark-block) | |
1103 (octave-send-region (point) (mark)))) | |
1104 | |
1105 (defun octave-send-defun () | |
1106 "Send current Octave function to the inferior Octave process." | |
1107 (interactive) | |
1108 (save-excursion | |
109815
7714e8a59020
Font-lock '...' strings, plus various simplifications and fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109757
diff
changeset
|
1109 (mark-defun) |
16901 | 1110 (octave-send-region (point) (mark)))) |
1111 | |
1112 (defun octave-send-line (&optional arg) | |
1113 "Send current Octave code line to the inferior Octave process. | |
1114 With positive prefix ARG, send that many lines. | |
1115 If `octave-send-line-auto-forward' is non-nil, go to the next unsent | |
1116 code line." | |
1117 (interactive "P") | |
1118 (or arg (setq arg 1)) | |
1119 (if (> arg 0) | |
1120 (let (beg end) | |
1121 (beginning-of-line) | |
1122 (setq beg (point)) | |
1123 (octave-next-code-line (- arg 1)) | |
1124 (end-of-line) | |
1125 (setq end (point)) | |
1126 (if octave-send-line-auto-forward | |
1127 (octave-next-code-line 1)) | |
1128 (octave-send-region beg end)))) | |
1129 | |
1130 (defun octave-eval-print-last-sexp () | |
1131 "Evaluate Octave sexp before point and print value into current buffer." | |
1132 (interactive) | |
1133 (inferior-octave t) | |
1134 (let ((standard-output (current-buffer)) | |
1135 (print-escape-newlines nil) | |
1136 (opoint (point))) | |
1137 (terpri) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49334
diff
changeset
|
1138 (prin1 |
16901 | 1139 (save-excursion |
1140 (forward-sexp -1) | |
1141 (inferior-octave-send-list-and-digest | |
1142 (list (concat (buffer-substring-no-properties (point) opoint) | |
1143 "\n"))) | |
1144 (mapconcat 'identity inferior-octave-output-list "\n"))) | |
1145 (terpri))) | |
16905
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1146 |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1147 ;;; Bug reporting |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1148 (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
|
1149 "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
|
1150 (interactive) |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1151 (require 'reporter) |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1152 (and |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1153 (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
|
1154 (reporter-submit-bug-report |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1155 octave-maintainer-address |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1156 (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
|
1157 (list |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1158 'octave-blink-matching-block |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1159 'octave-block-offset |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1160 'octave-comment-char |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1161 'octave-continuation-offset |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1162 'octave-continuation-string |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1163 'octave-send-echo-input |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1164 '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
|
1165 'octave-send-show-buffer)))) |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1166 |
94496
38eb904fa638
* progmodes/octave-mod.el (octave-help): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1167 ;; provide ourself |
16905
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1168 |
16911
123d19079d9f
Delete explicit autoload calls.
Richard M. Stallman <rms@gnu.org>
parents:
16905
diff
changeset
|
1169 (provide 'octave-mod) |
16905
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1170 |
a93836c8b52b
Merge in octave.el; don't require octave.el.
Richard M. Stallman <rms@gnu.org>
parents:
16902
diff
changeset
|
1171 ;;; octave-mod.el ends here |