annotate lisp/progmodes/octave-mod.el @ 109842:ecdbd21826de

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