Mercurial > emacs
annotate lisp/progmodes/python.el @ 70323:810cd69c168f
(tool-bar-setup): Put Help and Preferences items in the default tool-bar-map.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 01 May 2006 20:15:56 +0000 |
parents | 7a59f2600206 |
children | 2657308de2f6 2ecafc6d5db7 |
rev | line source |
---|---|
54789 | 1 ;;; python.el --- silly walks for Python |
2 | |
68773
dc49655f57ae
Update copyright for 2006.
Nick Roberts <nickrob@snap.net.nz>
parents:
68311
diff
changeset
|
3 ;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
54789 | 4 |
5 ;; Author: Dave Love <fx@gnu.org> | |
54943
07e279030b6f
(python-compilation-line-number): Fix braindamage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54938
diff
changeset
|
6 ;; Maintainer: FSF |
54789 | 7 ;; Created: Nov 2003 |
8 ;; Keywords: languages | |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; This file is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; This file is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
64085 | 24 ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
54789 | 26 |
27 ;;; Commentary: | |
28 | |
29 ;; Major mode for editing Python, with support for inferior processes. | |
30 | |
31 ;; There is another Python mode, python-mode.el, used by XEmacs and | |
32 ;; maintained with Python. That isn't covered by an FSF copyright | |
33 ;; assignment, unlike this code, and seems not to be well-maintained | |
34 ;; for Emacs (though I've submitted fixes). This mode is rather | |
35 ;; simpler and is, perhaps, better in other ways. In particular, | |
36 ;; using the syntax functions with text properties maintained by | |
37 ;; font-lock should make it more correct with arbitrary string and | |
38 ;; comment contents. | |
39 | |
40 ;; This doesn't implement all the facilities of python-mode.el. Some | |
41 ;; just need doing, e.g. catching exceptions in the inferior Python | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
42 ;; buffer (but see M-x pdb for debugging). [Actually, the use of |
54789 | 43 ;; `compilation-minor-mode' now is probably enough for that.] Others |
44 ;; don't seem appropriate. For instance, `forward-into-nomenclature' | |
45 ;; should be done separately, since it's not specific to Python, and | |
46 ;; I've installed a minor mode to do the job properly in Emacs 22. | |
47 ;; Other things seem more natural or canonical here, e.g. the | |
48 ;; {beginning,end}-of-defun implementation dealing with nested | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
49 ;; definitions, and the inferior mode following `cmuscheme'. The |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
50 ;; inferior mode can find the source of errors from |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
51 ;; `python-send-region' & al via `compilation-minor-mode'. Successive |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
52 ;; TABs cycle between possible indentations for the line. There is |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
53 ;; symbol completion using lookup in Python. |
54789 | 54 |
55 ;; Even where it has similar facilities, this is incompatible with | |
56 ;; python-mode.el in various respects. For instance, various key | |
57 ;; bindings are changed to obey Emacs conventions, and things like | |
58 ;; marking blocks and `beginning-of-defun' behave differently. | |
59 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
60 ;; TODO: See various Fixmes below. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
61 |
54789 | 62 ;;; Code: |
63 | |
64 ;; It's messy to autoload the relevant comint functions so that comint | |
65 ;; is only required when inferior Python is used. | |
66 (require 'comint) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
67 (eval-when-compile |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
68 (require 'compile) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
69 (autoload 'info-lookup-maybe-add-help "info-look")) |
54789 | 70 |
71 (defgroup python nil | |
64049
69990675200d
(python): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63831
diff
changeset
|
72 "Silly walks in the Python language." |
54789 | 73 :group 'languages |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59250
diff
changeset
|
74 :version "22.1" |
54789 | 75 :link '(emacs-commentary-link "python")) |
76 | |
77 ;;;###autoload | |
78 (add-to-list 'interpreter-mode-alist '("jython" . jython-mode)) | |
79 ;;;###autoload | |
80 (add-to-list 'interpreter-mode-alist '("python" . python-mode)) | |
81 ;;;###autoload | |
82 (add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode)) | |
83 | |
84 ;;;; Font lock | |
85 | |
86 (defvar python-font-lock-keywords | |
87 `(,(rx (and word-start | |
88 ;; From v 2.3 reference. | |
89 ;; def and class dealt with separately below | |
90 (or "and" "assert" "break" "continue" "del" "elif" "else" | |
91 "except" "exec" "finally" "for" "from" "global" "if" | |
92 "import" "in" "is" "lambda" "not" "or" "pass" "print" | |
93 "raise" "return" "try" "while" "yield" | |
94 ;; Future keywords | |
95 "as" "None") | |
96 word-end)) | |
97 (,(rx (and word-start (group "class") (1+ space) (group (1+ word)))) | |
98 (1 font-lock-keyword-face) (2 font-lock-type-face)) | |
99 (,(rx (and word-start (group "def") (1+ space) (group (1+ word)))) | |
100 (1 font-lock-keyword-face) (2 font-lock-function-name-face)))) | |
101 | |
102 (defconst python-font-lock-syntactic-keywords | |
103 ;; Make outer chars of matching triple-quote sequences into generic | |
104 ;; string delimiters. Fixme: Is there a better way? | |
58739
2761697b0e2f
(python-font-lock-syntactic-keywords): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
58487
diff
changeset
|
105 `((,(rx (and (or line-start buffer-start (not (syntax escape))) ; avoid escaped |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
106 ; leading quote |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
107 (group (optional (any "uUrR"))) ; prefix gets syntax property |
54789 | 108 (optional (any "rR")) ; possible second prefix |
109 (group (syntax string-quote)) ; maybe gets property | |
110 (backref 2) ; per first quote | |
111 (group (backref 2)))) ; maybe gets property | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
112 (1 (python-quote-syntax 1)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
113 (2 (python-quote-syntax 2)) |
54789 | 114 (3 (python-quote-syntax 3))) |
115 ;; This doesn't really help. | |
116 ;;; (,(rx (and ?\\ (group ?\n))) (1 " ")) | |
117 )) | |
118 | |
119 (defun python-quote-syntax (n) | |
120 "Put `syntax-table' property correctly on triple quote. | |
121 Used for syntactic keywords. N is the match number (1, 2 or 3)." | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
122 ;; Given a triple quote, we have to check the context to know |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
123 ;; whether this is an opening or closing triple or whether it's |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
124 ;; quoted anyhow, and should be ignored. (For that we need to do |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
125 ;; the same job as `syntax-ppss' to be correct and it seems to be OK |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
126 ;; to use it here despite initial worries.) We also have to sort |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
127 ;; out a possible prefix -- well, we don't _have_ to, but I think it |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
128 ;; should be treated as part of the string. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
129 |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
130 ;; Test cases: |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
131 ;; ur"""ar""" x='"' # """ |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
132 ;; x = ''' """ ' a |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
133 ;; ''' |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
134 ;; x '"""' x """ \"""" x |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
135 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
136 (goto-char (match-beginning 0)) |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
137 (cond |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
138 ;; Consider property for the last char if in a fenced string. |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
139 ((= n 3) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
140 (let ((syntax (syntax-ppss))) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
141 (when (eq t (nth 3 syntax)) ; after unclosed fence |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
142 (goto-char (nth 8 syntax)) ; fence position |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
143 ;; Skip any prefix. |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
144 (if (memq (char-after) '(?u ?U ?R ?r)) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
145 (skip-chars-forward "uUrR")) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
146 ;; Is it a matching sequence? |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
147 (if (eq (char-after) (char-after (match-beginning 2))) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
148 (eval-when-compile (string-to-syntax "|")))))) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
149 ;; Consider property for initial char, accounting for prefixes. |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
150 ((or (and (= n 2) ; not prefix |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
151 (= (match-beginning 1) (match-end 1))) ; prefix is null |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
152 (and (= n 1) ; prefix |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
153 (/= (match-beginning 1) (match-end 1)))) ; non-empty |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
154 (unless (eq 'string (syntax-ppss-context (syntax-ppss))) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
155 (eval-when-compile (string-to-syntax "|")))) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
156 ;; Otherwise (we're in a non-matching string) the property is |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
157 ;; nil, which is OK. |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
158 ))) |
54789 | 159 |
160 ;; This isn't currently in `font-lock-defaults' as probably not worth | |
161 ;; it -- we basically only mess with a few normally-symbol characters. | |
162 | |
163 ;; (defun python-font-lock-syntactic-face-function (state) | |
164 ;; "`font-lock-syntactic-face-function' for Python mode. | |
165 ;; Returns the string or comment face as usual, with side effect of putting | |
166 ;; a `syntax-table' property on the inside of the string or comment which is | |
167 ;; the standard syntax table." | |
168 ;; (if (nth 3 state) | |
169 ;; (save-excursion | |
170 ;; (goto-char (nth 8 state)) | |
171 ;; (condition-case nil | |
172 ;; (forward-sexp) | |
173 ;; (error nil)) | |
174 ;; (put-text-property (1+ (nth 8 state)) (1- (point)) | |
175 ;; 'syntax-table (standard-syntax-table)) | |
176 ;; 'font-lock-string-face) | |
177 ;; (put-text-property (1+ (nth 8 state)) (line-end-position) | |
178 ;; 'syntax-table (standard-syntax-table)) | |
179 ;; 'font-lock-comment-face)) | |
180 | |
181 ;;;; Keymap and syntax | |
182 | |
183 (defvar python-mode-map | |
184 (let ((map (make-sparse-keymap))) | |
185 ;; Mostly taken from python-mode.el. | |
186 (define-key map ":" 'python-electric-colon) | |
187 (define-key map "\177" 'python-backspace) | |
188 (define-key map "\C-c<" 'python-shift-left) | |
189 (define-key map "\C-c>" 'python-shift-right) | |
190 (define-key map "\C-c\C-k" 'python-mark-block) | |
191 (define-key map "\C-c\C-n" 'python-next-statement) | |
192 (define-key map "\C-c\C-p" 'python-previous-statement) | |
193 (define-key map "\C-c\C-u" 'python-beginning-of-block) | |
194 (define-key map "\C-c\C-f" 'python-describe-symbol) | |
195 (define-key map "\C-c\C-w" 'python-check) | |
196 (define-key map "\C-c\C-v" 'python-check) ; a la sgml-mode | |
197 (define-key map "\C-c\C-s" 'python-send-string) | |
198 (define-key map [?\C-\M-x] 'python-send-defun) | |
199 (define-key map "\C-c\C-r" 'python-send-region) | |
200 (define-key map "\C-c\M-r" 'python-send-region-and-go) | |
201 (define-key map "\C-c\C-c" 'python-send-buffer) | |
202 (define-key map "\C-c\C-z" 'python-switch-to-python) | |
203 (define-key map "\C-c\C-m" 'python-load-file) | |
204 (define-key map "\C-c\C-l" 'python-load-file) ; a la cmuscheme | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
205 (substitute-key-definition 'complete-symbol 'python-complete-symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
206 map global-map) |
54789 | 207 ;; Fixme: Add :help to menu. |
208 (easy-menu-define python-menu map "Python Mode menu" | |
209 '("Python" | |
210 ["Shift region left" python-shift-left :active mark-active] | |
211 ["Shift region right" python-shift-right :active mark-active] | |
212 "-" | |
213 ["Mark block" python-mark-block] | |
214 ["Mark def/class" mark-defun | |
215 :help "Mark innermost definition around point"] | |
216 "-" | |
217 ["Start of block" python-beginning-of-block] | |
218 ["End of block" python-end-of-block] | |
219 ["Start of def/class" beginning-of-defun | |
220 :help "Go to start of innermost definition around point"] | |
221 ["End of def/class" end-of-defun | |
222 :help "Go to end of innermost definition around point"] | |
223 "-" | |
224 ["Start interpreter" run-python | |
225 :help "Run `inferior' Python in separate buffer"] | |
226 ["Import/reload file" python-load-file | |
227 :help "Load into inferior Python session"] | |
228 ["Eval buffer" python-send-buffer | |
229 :help "Evaluate buffer en bloc in inferior Python session"] | |
230 ["Eval region" python-send-region :active mark-active | |
231 :help "Evaluate region en bloc in inferior Python session"] | |
232 ["Eval def/class" python-send-defun | |
233 :help "Evaluate current definition in inferior Python session"] | |
234 ["Switch to interpreter" python-switch-to-python | |
235 :help "Switch to inferior Python buffer"] | |
236 ["Check file" python-check :help "Run pychecker"] | |
237 ["Debugger" pdb :help "Run pdb under GUD"] | |
238 "-" | |
239 ["Help on symbol" python-describe-symbol | |
240 :help "Use pydoc on symbol at point"])) | |
241 map)) | |
242 | |
243 (defvar python-mode-syntax-table | |
244 (let ((table (make-syntax-table))) | |
245 ;; Give punctuation syntax to ASCII that normally has symbol | |
246 ;; syntax or has word syntax and isn't a letter. | |
247 (let ((symbol (string-to-syntax "_")) | |
248 (sst (standard-syntax-table))) | |
249 (dotimes (i 128) | |
250 (unless (= i ?_) | |
251 (if (equal symbol (aref sst i)) | |
252 (modify-syntax-entry i "." table))))) | |
253 (modify-syntax-entry ?$ "." table) | |
254 (modify-syntax-entry ?% "." table) | |
255 ;; exceptions | |
256 (modify-syntax-entry ?# "<" table) | |
257 (modify-syntax-entry ?\n ">" table) | |
258 (modify-syntax-entry ?' "\"" table) | |
259 (modify-syntax-entry ?` "$" table) | |
260 table)) | |
261 | |
262 ;;;; Utility stuff | |
263 | |
264 (defsubst python-in-string/comment () | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
265 "Return non-nil if point is in a Python literal (a comment or string)." |
54789 | 266 (syntax-ppss-context (syntax-ppss))) |
267 | |
268 (defconst python-space-backslash-table | |
269 (let ((table (copy-syntax-table python-mode-syntax-table))) | |
270 (modify-syntax-entry ?\\ " " table) | |
271 table) | |
272 "`python-mode-syntax-table' with backslash given whitespace syntax.") | |
273 | |
274 (defun python-skip-comments/blanks (&optional backward) | |
275 "Skip comments and blank lines. | |
276 BACKWARD non-nil means go backwards, otherwise go forwards. Backslash is | |
277 treated as whitespace so that continued blank lines are skipped. | |
278 Doesn't move out of comments -- should be outside or at end of line." | |
279 (with-syntax-table python-space-backslash-table | |
280 (forward-comment (if backward | |
281 most-negative-fixnum | |
282 most-positive-fixnum)))) | |
283 | |
284 (defun python-backslash-continuation-line-p () | |
285 "Non-nil if preceding line ends with backslash that is not in a comment." | |
286 (and (eq ?\\ (char-before (line-end-position 0))) | |
287 (not (syntax-ppss-context (syntax-ppss))))) | |
288 | |
289 (defun python-continuation-line-p () | |
290 "Return non-nil if current line continues a previous one. | |
291 The criteria are that the previous line ends in a backslash outside | |
292 comments and strings, or that the bracket/paren nesting depth is nonzero." | |
293 (or (and (eq ?\\ (char-before (line-end-position 0))) | |
294 (not (syntax-ppss-context (syntax-ppss)))) | |
70219
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
295 (< 0 (syntax-ppss-depth |
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
296 (save-excursion ; syntax-ppss with arg changes point |
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
297 (syntax-ppss (line-beginning-position))))))) |
54789 | 298 |
299 (defun python-comment-line-p () | |
55495
4e81c5df6c36
(inferior-python-mode-map): Remove erroneous C-c C-z binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55447
diff
changeset
|
300 "Return non-nil iff current line has only a comment." |
54789 | 301 (save-excursion |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
302 (end-of-line) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
303 (when (eq 'comment (syntax-ppss-context (syntax-ppss))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
304 (back-to-indentation) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
305 (looking-at (rx (or (syntax comment-start) line-end)))))) |
54789 | 306 |
307 (defun python-beginning-of-string () | |
308 "Go to beginning of string around point. | |
309 Do nothing if not in string." | |
310 (let ((state (syntax-ppss))) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
311 (when (eq 'string (syntax-ppss-context state)) |
54789 | 312 (goto-char (nth 8 state))))) |
313 | |
314 (defun python-open-block-statement-p (&optional bos) | |
315 "Return non-nil if statement at point opens a block. | |
316 BOS non-nil means point is known to be at beginning of statement." | |
317 (save-excursion | |
318 (unless bos (python-beginning-of-statement)) | |
319 (and (not (python-comment-line-p)) | |
320 (re-search-forward (rx (and ?: (0+ space) | |
321 (optional (and (syntax comment-start) | |
322 (0+ not-newline))) | |
323 line-end)) | |
324 (save-excursion (python-end-of-statement)) | |
325 t) | |
56051
0cecb3d4d566
(python-open-block-statement-p): Fix
Eli Zaretskii <eliz@gnu.org>
parents:
55511
diff
changeset
|
326 (not (progn (goto-char (match-beginning 0)) |
0cecb3d4d566
(python-open-block-statement-p): Fix
Eli Zaretskii <eliz@gnu.org>
parents:
55511
diff
changeset
|
327 (python-in-string/comment)))))) |
54789 | 328 |
329 (defun python-close-block-statement-p (&optional bos) | |
330 "Return non-nil if current line is a statement closing a block. | |
331 BOS non-nil means point is at beginning of statement. | |
332 The criteria are that the line isn't a comment or in string and starts with | |
333 keyword `raise', `break', `continue' or `pass'." | |
334 (save-excursion | |
335 (unless bos (python-beginning-of-statement)) | |
336 (back-to-indentation) | |
337 (looking-at (rx (and (or "return" "raise" "break" "continue" "pass") | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
338 symbol-end))))) |
54789 | 339 |
340 (defun python-outdent-p () | |
341 "Return non-nil if current line should outdent a level." | |
342 (save-excursion | |
343 (back-to-indentation) | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
344 (and (looking-at (rx (and (or (and (or "else" "finally") symbol-end) |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
345 (and (or "except" "elif") symbol-end |
54789 | 346 (1+ (not (any ?:))))) |
347 (optional space) ":" (optional space) | |
348 (or (syntax comment-start) line-end)))) | |
349 (progn (end-of-line) | |
350 (not (python-in-string/comment))) | |
351 ;; Ensure there's a previous statement and move to it. | |
352 (zerop (python-previous-statement)) | |
353 (not (python-close-block-statement-p t)) | |
354 ;; Fixme: check this | |
355 (not (looking-at (rx (and (or (and (or "if" "elif" "except" | |
356 "for" "while") | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
357 symbol-end (1+ (not (any ?:)))) |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
358 (and "try" symbol-end)) |
54789 | 359 (optional space) ":" (optional space) |
360 (or (syntax comment-start) line-end))))) | |
361 (progn (end-of-line) | |
362 (not (python-in-string/comment)))))) | |
363 | |
364 ;;;; Indentation. | |
365 | |
366 (defcustom python-indent 4 | |
367 "*Number of columns for a unit of indentation in Python mode. | |
368 See also `\\[python-guess-indent]'" | |
369 :group 'python | |
370 :type 'integer) | |
371 | |
372 (defcustom python-guess-indent t | |
373 "*Non-nil means Python mode guesses `python-indent' for the buffer." | |
374 :type 'boolean | |
375 :group 'python) | |
376 | |
377 (defcustom python-indent-string-contents t | |
378 "*Non-nil means indent contents of multi-line strings together. | |
379 This means indent them the same as the preceding non-blank line. | |
380 Otherwise indent them to column zero." | |
381 :type '(choice (const :tag "Align with preceding" t) | |
382 (const :tag "Indent to column 0" nil)) | |
383 :group 'python) | |
384 | |
385 (defcustom python-honour-comment-indentation nil | |
386 "Non-nil means indent relative to preceding comment line. | |
387 Only do this for comments where the leading comment character is followed | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
388 by space. This doesn't apply to comment lines, which are always indented |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
389 in lines with preceding comments." |
54789 | 390 :type 'boolean |
391 :group 'python) | |
392 | |
393 (defcustom python-continuation-offset 4 | |
394 "*Number of columns of additional indentation for continuation lines. | |
395 Continuation lines follow a backslash-terminated line starting a statement." | |
396 :group 'python | |
397 :type 'integer) | |
398 | |
399 (defun python-guess-indent () | |
400 "Guess step for indentation of current buffer. | |
401 Set `python-indent' locally to the value guessed." | |
402 (interactive) | |
403 (save-excursion | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
404 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
405 (widen) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
406 (goto-char (point-min)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
407 (let (done indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
408 (while (and (not done) (not (eobp))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
409 (when (and (re-search-forward (rx (and ?: (0+ space) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
410 (or (syntax comment-start) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
411 line-end))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
412 nil 'move) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
413 (python-open-block-statement-p)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
414 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
415 (python-beginning-of-statement) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
416 (let ((initial (current-indentation))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
417 (if (zerop (python-next-statement)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
418 (setq indent (- (current-indentation) initial))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
419 (if (and (>= indent 2) (<= indent 8)) ; sanity check |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
420 (setq done t)))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
421 (when done |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
422 (when (/= indent (default-value 'python-indent)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
423 (set (make-local-variable 'python-indent) indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
424 (unless (= tab-width python-indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
425 (setq indent-tabs-mode nil))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
426 indent))))) |
54789 | 427 |
428 (defun python-calculate-indentation () | |
429 "Calculate Python indentation for line at point." | |
430 (save-excursion | |
431 (beginning-of-line) | |
432 (let ((syntax (syntax-ppss)) | |
433 start) | |
434 (cond | |
435 ((eq 'string (syntax-ppss-context syntax)) ; multi-line string | |
436 (if (not python-indent-string-contents) | |
437 0 | |
438 (save-excursion | |
439 ;; Find indentation of preceding non-blank line within string. | |
440 (setq start (nth 8 syntax)) | |
441 (forward-line -1) | |
442 (while (and (< start (point)) (looking-at "\\s-*$")) | |
443 (forward-line -1)) | |
444 (current-indentation)))) | |
445 ((python-continuation-line-p) | |
446 (let ((point (point)) | |
447 (open-start (cadr syntax))) | |
448 (if open-start | |
449 ;; Inside bracketed expression. | |
450 (progn | |
451 (goto-char (1+ open-start)) | |
452 ;; Look for first item in list (preceding point) and | |
453 ;; align with it, if found. | |
454 (if (with-syntax-table python-space-backslash-table | |
455 (let ((parse-sexp-ignore-comments t)) | |
456 (condition-case () | |
457 (progn (forward-sexp) | |
458 (backward-sexp) | |
459 (< (point) point)) | |
460 (error nil)))) | |
461 (current-column) | |
462 ;; Otherwise indent relative to statement start, one | |
463 ;; level per bracketing level. | |
464 (goto-char (1+ open-start)) | |
465 (python-beginning-of-statement) | |
466 (+ (current-indentation) (* (car syntax) python-indent)))) | |
467 ;; Otherwise backslash-continued. | |
468 (forward-line -1) | |
469 (if (python-continuation-line-p) | |
470 ;; We're past first continuation line. Align with | |
471 ;; previous line. | |
472 (current-indentation) | |
473 ;; First continuation line. Indent one step, with an | |
474 ;; extra one if statement opens a block. | |
475 (save-excursion | |
476 (python-beginning-of-statement) | |
477 (+ (current-indentation) python-continuation-offset | |
478 (if (python-open-block-statement-p t) | |
479 python-indent | |
480 0))))))) | |
481 ((bobp) 0) | |
482 ;; Fixme: Like python-mode.el; not convinced by this. | |
483 ((looking-at (rx (and (0+ space) (syntax comment-start) | |
484 (not (any " \t\n"))))) ; non-indentable comment | |
485 (current-indentation)) | |
486 (t (let ((point (point))) | |
487 (if python-honour-comment-indentation | |
488 ;; Back over whitespace, newlines, non-indentable comments. | |
489 (catch 'done | |
490 (while t | |
491 (if (cond ((bobp)) | |
492 ;; not at comment start | |
493 ((not (forward-comment -1)) | |
494 (python-beginning-of-statement) | |
495 t) | |
496 ;; trailing comment | |
497 ((/= (current-column) (current-indentation)) | |
498 (python-beginning-of-statement) | |
499 t) | |
500 ;; indentable comment like python-mode.el | |
501 ((and (looking-at (rx (and (syntax comment-start) | |
502 (or space line-end)))) | |
503 (/= 0 (current-column))))) | |
504 (throw 'done t)))) | |
505 ;; Else back over all comments. | |
506 (python-skip-comments/blanks t) | |
507 (python-beginning-of-statement)) | |
508 ;; don't lose on bogus outdent | |
509 (max 0 (+ (current-indentation) | |
510 (or (cond ((python-open-block-statement-p t) | |
511 python-indent) | |
512 ((python-close-block-statement-p t) | |
513 (- python-indent))) | |
514 (progn (goto-char point) | |
515 (if (python-outdent-p) | |
516 (- python-indent))) | |
517 0))))))))) | |
518 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
519 (defun python-comment-indent () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
520 "`comment-indent-function' for Python." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
521 ;; If previous non-blank line was a comment, use its indentation. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
522 ;; FIXME: This seems unnecessary since the default code delegates to |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
523 ;; indent-according-to-mode. --Stef |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
524 (unless (bobp) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
525 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
526 (forward-comment -1) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
527 (if (eq ?# (char-after)) (current-column))))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
528 |
54789 | 529 ;;;; Cycling through the possible indentations with successive TABs. |
530 | |
531 ;; These don't need to be buffer-local since they're only relevant | |
532 ;; during a cycle. | |
533 | |
534 ;; Alist of possible indentations and start of statement they would close. | |
535 (defvar python-indent-list nil | |
536 "Internal use.") | |
537 ;; Length of the above | |
538 (defvar python-indent-list-length nil | |
539 "Internal use.") | |
540 ;; Current index into the alist. | |
541 (defvar python-indent-index nil | |
542 "Internal use.") | |
543 | |
544 (defun python-initial-text () | |
545 "Text of line following indentation and ignoring any trailing comment." | |
546 (buffer-substring (+ (line-beginning-position) (current-indentation)) | |
547 (save-excursion | |
548 (end-of-line) | |
549 (forward-comment -1) | |
550 (point)))) | |
551 | |
552 (defun python-indentation-levels () | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
553 "Return a list of possible indentations for this line. |
54789 | 554 Includes the default indentation and those which would close all |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
555 enclosing blocks. Assumes the line has already been indented per |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
556 `python-indent-line'. Elements of the list are actually pairs: |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
557 \(INDENTATION . TEXT), where TEXT is the initial text of the |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
558 corresponding block opening (or nil)." |
54789 | 559 (save-excursion |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
560 (let ((levels (list (cons (current-indentation) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
561 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
562 (if (python-beginning-of-block) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
563 (python-initial-text))))))) |
54789 | 564 ;; Only one possibility if we immediately follow a block open or |
565 ;; are in a continuation line. | |
566 (unless (or (python-continuation-line-p) | |
567 (save-excursion (and (python-previous-statement) | |
568 (python-open-block-statement-p t)))) | |
569 (while (python-beginning-of-block) | |
570 (push (cons (current-indentation) (python-initial-text)) | |
571 levels))) | |
572 levels))) | |
573 | |
574 ;; This is basically what `python-indent-line' would be if we didn't | |
575 ;; do the cycling. | |
576 (defun python-indent-line-1 () | |
577 "Subroutine of `python-indent-line'." | |
578 (let ((target (python-calculate-indentation)) | |
579 (pos (- (point-max) (point)))) | |
580 (if (= target (current-indentation)) | |
581 (if (< (current-column) (current-indentation)) | |
582 (back-to-indentation)) | |
583 (beginning-of-line) | |
584 (delete-horizontal-space) | |
585 (indent-to target) | |
586 (if (> (- (point-max) pos) (point)) | |
587 (goto-char (- (point-max) pos)))))) | |
588 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
589 (defun python-indent-line () |
54789 | 590 "Indent current line as Python code. |
591 When invoked via `indent-for-tab-command', cycle through possible | |
592 indentations for current line. The cycle is broken by a command different | |
593 from `indent-for-tab-command', i.e. successive TABs do the cycling." | |
594 (interactive) | |
595 ;; Don't do extra work if invoked via `indent-region', for instance. | |
596 (if (not (eq this-command 'indent-for-tab-command)) | |
597 (python-indent-line-1) | |
598 (if (eq last-command this-command) | |
599 (if (= 1 python-indent-list-length) | |
600 (message "Sole indentation") | |
601 (progn (setq python-indent-index (% (1+ python-indent-index) | |
602 python-indent-list-length)) | |
603 (beginning-of-line) | |
604 (delete-horizontal-space) | |
605 (indent-to (car (nth python-indent-index python-indent-list))) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
606 (if (python-block-end-p) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
607 (let ((text (cdr (nth python-indent-index |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
608 python-indent-list)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
609 (if text |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
610 (message "Closes: %s" text)))))) |
54789 | 611 (python-indent-line-1) |
612 (setq python-indent-list (python-indentation-levels) | |
613 python-indent-list-length (length python-indent-list) | |
614 python-indent-index (1- python-indent-list-length))))) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
615 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
616 (defun python-block-end-p () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
617 "Non-nil if this is a line in a statement closing a block, |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
618 or a blank line indented to where it would close a block." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
619 (and (not (python-comment-line-p)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
620 (or (python-close-block-statement-p t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
621 (< (current-indentation) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
622 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
623 (python-previous-statement) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
624 (current-indentation)))))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
625 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
626 ;; Fixme: Define an indent-region-function. It should probably leave |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
627 ;; lines alone if the indentation is already at one of the allowed |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
628 ;; levels. Otherwise, M-C-\ typically keeps indenting more deeply |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
629 ;; down a function. |
54789 | 630 |
631 ;;;; Movement. | |
632 | |
633 (defun python-beginning-of-defun () | |
634 "`beginning-of-defun-function' for Python. | |
635 Finds beginning of innermost nested class or method definition. | |
636 Returns the name of the definition found at the end, or nil if reached | |
637 start of buffer." | |
638 (let ((ci (current-indentation)) | |
639 (def-re (rx (and line-start (0+ space) (or "def" "class") | |
640 (1+ space) | |
641 (group (1+ (or word (syntax symbol))))))) | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
642 found lep def-line) |
54789 | 643 (if (python-comment-line-p) |
644 (setq ci most-positive-fixnum)) | |
645 (while (and (not (bobp)) (not found)) | |
646 ;; Treat bol at beginning of function as outside function so | |
647 ;; that successive C-M-a makes progress backwards. | |
648 (setq def-line (looking-at def-re)) | |
649 (unless (bolp) (end-of-line)) | |
650 (setq lep (line-end-position)) | |
651 (if (and (re-search-backward def-re nil 'move) | |
652 ;; Must be less indented or matching top level, or | |
653 ;; equally indented if we started on a definition line. | |
654 (let ((in (current-indentation))) | |
655 (or (and (zerop ci) (zerop in)) | |
656 (= lep (line-end-position)) ; on initial line | |
657 (and def-line (= in ci)) | |
658 (< in ci))) | |
659 (not (python-in-string/comment))) | |
660 (setq found t))))) | |
661 | |
662 (defun python-end-of-defun () | |
663 "`end-of-defun-function' for Python. | |
664 Finds end of innermost nested class or method definition." | |
665 (let ((orig (point)) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
666 (pattern (rx (and line-start (0+ space) (or "def" "class") space)))) |
54789 | 667 ;; Go to start of current block and check whether it's at top |
668 ;; level. If it is, and not a block start, look forward for | |
669 ;; definition statement. | |
670 (when (python-comment-line-p) | |
671 (end-of-line) | |
672 (forward-comment most-positive-fixnum)) | |
673 (if (not (python-open-block-statement-p)) | |
674 (python-beginning-of-block)) | |
675 (if (zerop (current-indentation)) | |
676 (unless (python-open-block-statement-p) | |
677 (while (and (re-search-forward pattern nil 'move) | |
678 (python-in-string/comment))) ; just loop | |
679 (unless (eobp) | |
680 (beginning-of-line))) | |
681 ;; Don't move before top-level statement that would end defun. | |
682 (end-of-line) | |
683 (python-beginning-of-defun)) | |
684 ;; If we got to the start of buffer, look forward for | |
685 ;; definition statement. | |
686 (if (and (bobp) (not (looking-at "def\\|class"))) | |
687 (while (and (not (eobp)) | |
688 (re-search-forward pattern nil 'move) | |
689 (python-in-string/comment)))) ; just loop | |
690 ;; We're at a definition statement (or end-of-buffer). | |
691 (unless (eobp) | |
692 (python-end-of-block) | |
693 ;; Count trailing space in defun (but not trailing comments). | |
694 (skip-syntax-forward " >") | |
695 (beginning-of-line)) | |
696 ;; Catch pathological case like this, where the beginning-of-defun | |
697 ;; skips to a definition we're not in: | |
698 ;; if ...: | |
699 ;; ... | |
700 ;; else: | |
701 ;; ... # point here | |
702 ;; ... | |
703 ;; def ... | |
704 (if (< (point) orig) | |
705 (goto-char (point-max))))) | |
706 | |
707 (defun python-beginning-of-statement () | |
708 "Go to start of current statement. | |
709 Accounts for continuation lines, multi-line strings, and multi-line bracketed | |
710 expressions." | |
711 (beginning-of-line) | |
712 (python-beginning-of-string) | |
56324
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
713 (catch 'foo |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
714 (while (python-continuation-line-p) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
715 (beginning-of-line) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
716 (if (python-backslash-continuation-line-p) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
717 (while (python-backslash-continuation-line-p) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
718 (forward-line -1)) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
719 (python-beginning-of-string) |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
720 ;; Skip forward out of nested brackets. |
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
721 (condition-case () ; beware invalid syntax |
70219
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
722 (let ((depth (syntax-ppss-depth (syntax-ppss)))) |
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
723 ;; Beware negative depths. |
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
724 (if (> depth 0) (backward-up-list depth)) |
7a59f2600206
(python-continuation-line-p, python-beginning-of-statement):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70112
diff
changeset
|
725 t) |
56324
e6bf7376c962
(python-beginning-of-statement): Exit the loop if backward-up-list gets error.
Richard M. Stallman <rms@gnu.org>
parents:
56051
diff
changeset
|
726 (error (throw 'foo nil)))))) |
54789 | 727 (back-to-indentation)) |
728 | |
729 (defun python-end-of-statement () | |
730 "Go to the end of the current statement and return point. | |
731 Usually this is the start of the next line, but if this is a | |
732 multi-line statement we need to skip over the continuation lines. | |
733 On a comment line, go to end of line." | |
734 (end-of-line) | |
735 (while (let (comment) | |
736 ;; Move past any enclosing strings and sexps, or stop if | |
737 ;; we're in a comment. | |
738 (while (let ((s (syntax-ppss))) | |
739 (cond ((eq 'comment (syntax-ppss-context s)) | |
740 (setq comment t) | |
741 nil) | |
742 ((eq 'string (syntax-ppss-context s)) | |
743 ;; Go to start of string and skip it. | |
744 (goto-char (nth 8 s)) | |
745 (condition-case () ; beware invalid syntax | |
746 (progn (forward-sexp) t) | |
747 (error (end-of-line)))) | |
748 ((> (syntax-ppss-depth s) 0) | |
749 ;; Skip forward out of nested brackets. | |
750 (condition-case () ; beware invalid syntax | |
751 (progn (backward-up-list | |
752 (- (syntax-ppss-depth s))) | |
753 t) | |
754 (error (end-of-line)))))) | |
755 (end-of-line)) | |
756 (unless comment | |
757 (eq ?\\ (char-before)))) ; Line continued? | |
758 (end-of-line 2)) ; Try next line. | |
759 (point)) | |
760 | |
761 (defun python-previous-statement (&optional count) | |
762 "Go to start of previous statement. | |
763 With argument COUNT, do it COUNT times. Stop at beginning of buffer. | |
764 Return count of statements left to move." | |
765 (interactive "p") | |
766 (unless count (setq count 1)) | |
767 (if (< count 0) | |
768 (python-next-statement (- count)) | |
769 (python-beginning-of-statement) | |
770 (while (and (> count 0) (not (bobp))) | |
771 (python-skip-comments/blanks t) | |
772 (python-beginning-of-statement) | |
773 (unless (bobp) (setq count (1- count)))) | |
774 count)) | |
775 | |
776 (defun python-next-statement (&optional count) | |
777 "Go to start of next statement. | |
778 With argument COUNT, do it COUNT times. Stop at end of buffer. | |
779 Return count of statements left to move." | |
780 (interactive "p") | |
781 (unless count (setq count 1)) | |
782 (if (< count 0) | |
783 (python-previous-statement (- count)) | |
784 (beginning-of-line) | |
785 (while (and (> count 0) (not (eobp))) | |
786 (python-end-of-statement) | |
787 (python-skip-comments/blanks) | |
788 (setq count (1- count))) | |
789 count)) | |
790 | |
791 (defun python-beginning-of-block (&optional arg) | |
792 "Go to start of current block. | |
793 With numeric arg, do it that many times. If ARG is negative, call | |
794 `python-end-of-block' instead. | |
795 If point is on the first line of a block, use its outer block. | |
796 If current statement is in column zero, don't move and return nil. | |
797 Otherwise return non-nil." | |
798 (interactive "p") | |
799 (unless arg (setq arg 1)) | |
800 (cond | |
801 ((zerop arg)) | |
802 ((< arg 0) (python-end-of-block (- arg))) | |
803 (t | |
804 (let ((point (point))) | |
805 (if (python-comment-line-p) | |
806 (python-skip-comments/blanks t)) | |
807 (python-beginning-of-statement) | |
808 (let ((ci (current-indentation))) | |
809 (if (zerop ci) | |
810 (not (goto-char point)) ; return nil | |
811 ;; Look upwards for less indented statement. | |
812 (if (catch 'done | |
813 ;;; This is slower than the below. | |
814 ;;; (while (zerop (python-previous-statement)) | |
815 ;;; (when (and (< (current-indentation) ci) | |
816 ;;; (python-open-block-statement-p t)) | |
817 ;;; (beginning-of-line) | |
818 ;;; (throw 'done t))) | |
819 (while (and (zerop (forward-line -1))) | |
820 (when (and (< (current-indentation) ci) | |
821 (not (python-comment-line-p)) | |
822 ;; Move to beginning to save effort in case | |
823 ;; this is in string. | |
824 (progn (python-beginning-of-statement) t) | |
825 (python-open-block-statement-p t)) | |
826 (beginning-of-line) | |
827 (throw 'done t))) | |
828 (not (goto-char point))) ; Failed -- return nil | |
829 (python-beginning-of-block (1- arg))))))))) | |
830 | |
831 (defun python-end-of-block (&optional arg) | |
832 "Go to end of current block. | |
833 With numeric arg, do it that many times. If ARG is negative, call | |
834 `python-beginning-of-block' instead. | |
835 If current statement is in column zero and doesn't open a block, don't | |
836 move and return nil. Otherwise return t." | |
837 (interactive "p") | |
838 (unless arg (setq arg 1)) | |
839 (if (< arg 0) | |
840 (python-beginning-of-block (- arg))) | |
841 (while (and (> arg 0) | |
842 (let* ((point (point)) | |
843 (_ (if (python-comment-line-p) | |
844 (python-skip-comments/blanks t))) | |
845 (ci (current-indentation)) | |
846 (open (python-open-block-statement-p))) | |
847 (if (and (zerop ci) (not open)) | |
848 (not (goto-char point)) | |
849 (catch 'done | |
850 (while (zerop (python-next-statement)) | |
851 (when (or (and open (<= (current-indentation) ci)) | |
852 (< (current-indentation) ci)) | |
853 (python-skip-comments/blanks t) | |
854 (beginning-of-line 2) | |
855 (throw 'done t))) | |
856 (not (goto-char point)))))) | |
857 (setq arg (1- arg))) | |
858 (zerop arg)) | |
859 | |
860 ;;;; Imenu. | |
861 | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
862 (defvar python-recursing) |
54789 | 863 (defun python-imenu-create-index () |
864 "`imenu-create-index-function' for Python. | |
865 | |
866 Makes nested Imenu menus from nested `class' and `def' statements. | |
867 The nested menus are headed by an item referencing the outer | |
868 definition; it has a space prepended to the name so that it sorts | |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
869 first with `imenu--sort-by-name' (though, unfortunately, sub-menus |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
870 precede it)." |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
871 (unless (boundp 'python-recursing) ; dynamically bound below |
54789 | 872 (goto-char (point-min))) ; normal call from Imenu |
873 (let (index-alist ; accumulated value to return | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
874 name) |
54789 | 875 (while (re-search-forward |
876 (rx (and line-start (0+ space) ; leading space | |
877 (or (group "def") (group "class")) ; type | |
878 (1+ space) (group (1+ (or word ?_))))) ; name | |
879 nil t) | |
880 (unless (python-in-string/comment) | |
881 (let ((pos (match-beginning 0)) | |
882 (name (match-string-no-properties 3))) | |
883 (if (match-beginning 2) ; def or class? | |
884 (setq name (concat "class " name))) | |
885 (save-restriction | |
886 (narrow-to-defun) | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
887 (let* ((python-recursing t) |
54789 | 888 (sublist (python-imenu-create-index))) |
889 (if sublist | |
890 (progn (push (cons (concat " " name) pos) sublist) | |
891 (push (cons name sublist) index-alist)) | |
892 (push (cons name pos) index-alist))))))) | |
893 (nreverse index-alist))) | |
894 | |
895 ;;;; `Electric' commands. | |
896 | |
897 (defun python-electric-colon (arg) | |
898 "Insert a colon and maybe outdent the line if it is a statement like `else'. | |
899 With numeric ARG, just insert that many colons. With \\[universal-argument], | |
900 just insert a single colon." | |
901 (interactive "*P") | |
902 (self-insert-command (if (not (integerp arg)) 1 arg)) | |
903 (and (not arg) | |
904 (eolp) | |
905 (python-outdent-p) | |
906 (not (python-in-string/comment)) | |
907 (> (current-indentation) (python-calculate-indentation)) | |
908 (python-indent-line))) ; OK, do it | |
909 (put 'python-electric-colon 'delete-selection t) | |
910 | |
911 (defun python-backspace (arg) | |
912 "Maybe delete a level of indentation on the current line. | |
913 If not at the end of line's indentation, or on a comment line, just call | |
914 `backward-delete-char-untabify'. With ARG, repeat that many times." | |
915 (interactive "*p") | |
916 (if (or (/= (current-indentation) (current-column)) | |
917 (bolp) | |
918 (python-continuation-line-p)) | |
919 (backward-delete-char-untabify arg) | |
920 (let ((indent 0)) | |
921 (save-excursion | |
922 (while (and (> arg 0) (python-beginning-of-block)) | |
923 (setq arg (1- arg))) | |
924 (when (zerop arg) | |
925 (setq indent (current-indentation)) | |
926 (message "Closes %s" (python-initial-text)))) | |
927 (delete-horizontal-space) | |
928 (indent-to indent)))) | |
929 (put 'python-backspace 'delete-selection 'supersede) | |
930 | |
931 ;;;; pychecker | |
932 | |
933 (defcustom python-check-command "pychecker --stdlib" | |
934 "*Command used to check a Python file." | |
935 :type 'string | |
936 :group 'python) | |
937 | |
938 (defvar python-saved-check-command nil | |
939 "Internal use.") | |
940 | |
941 ;; After `sgml-validate-command'. | |
942 (defun python-check (command) | |
943 "Check a Python file (default current buffer's file). | |
944 Runs COMMAND, a shell command, as if by `compile'. | |
945 See `python-check-command' for the default." | |
946 (interactive | |
947 (list (read-string "Checker command: " | |
948 (or python-saved-check-command | |
949 (concat python-check-command " " | |
950 (let ((name (buffer-file-name))) | |
951 (if name | |
952 (file-name-nondirectory name)))))))) | |
953 (setq python-saved-check-command command) | |
63831
1962e8146bf4
(python-check): Require `compile' before modifying its variables.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61857
diff
changeset
|
954 (require 'compile) ;To define compilation-* variables. |
54789 | 955 (save-some-buffers (not compilation-ask-about-save) nil) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
956 (let ((compilation-error-regexp-alist |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
957 (cons '("(\\([^,]+\\), line \\([0-9]+\\))" 1 2) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
958 compilation-error-regexp-alist))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
959 (compilation-start command))) |
54789 | 960 |
961 ;;;; Inferior mode stuff (following cmuscheme). | |
962 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
963 ;; Fixme: Make sure we can work with IPython. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
964 |
54789 | 965 (defcustom python-python-command "python" |
966 "*Shell command to run Python interpreter. | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
967 Any arguments can't contain whitespace. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
968 Note that IPython may not work properly; it must at least be used with the |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
969 `-cl' flag, i.e. use `ipython -cl'." |
54789 | 970 :group 'python |
971 :type 'string) | |
972 | |
973 (defcustom python-jython-command "jython" | |
974 "*Shell command to run Jython interpreter. | |
975 Any arguments can't contain whitespace." | |
976 :group 'python | |
977 :type 'string) | |
978 | |
979 (defvar python-command python-python-command | |
980 "Actual command used to run Python. | |
981 May be `python-python-command' or `python-jython-command'. | |
982 Additional arguments are added when the command is used by `run-python' | |
983 et al.") | |
984 | |
985 (defvar python-buffer nil | |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
986 "The current python process buffer." |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
987 ;; Fixme: a single process is currently assumed, so that this doc |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
988 ;; is misleading. |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
989 |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
990 ;; "*The current python process buffer. |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
991 ;; To run multiple Python processes, start the first with \\[run-python]. |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
992 ;; It will be in a buffer named *Python*. Rename that with |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
993 ;; \\[rename-buffer]. Now start a new process with \\[run-python]. It |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
994 ;; will be in a new buffer, named *Python*. Switch between the different |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
995 ;; process buffers with \\[switch-to-buffer]. |
54789 | 996 |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
997 ;; Commands that send text from source buffers to Python processes have |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
998 ;; to choose a process to send to. This is determined by global variable |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
999 ;; `python-buffer'. Suppose you have three inferior Pythons running: |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1000 ;; Buffer Process |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1001 ;; foo python |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1002 ;; bar python<2> |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1003 ;; *Python* python<3> |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1004 ;; If you do a \\[python-send-region-and-go] command on some Python source |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1005 ;; code, what process does it go to? |
54789 | 1006 |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1007 ;; - In a process buffer (foo, bar, or *Python*), send it to that process. |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1008 ;; - In some other buffer (e.g. a source file), send it to the process |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1009 ;; attached to `python-buffer'. |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1010 ;; Process selection is done by function `python-proc'. |
54789 | 1011 |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1012 ;; Whenever \\[run-python] starts a new process, it resets `python-buffer' |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1013 ;; to be the new process's buffer. If you only run one process, this will |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1014 ;; do the right thing. If you run multiple processes, you can change |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1015 ;; `python-buffer' to another process buffer with \\[set-variable]." |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1016 ) |
54789 | 1017 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1018 (defconst python-compilation-regexp-alist |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1019 ;; FIXME: maybe these should move to compilation-error-regexp-alist-alist. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1020 `((,(rx (and line-start (1+ (any " \t")) "File \"" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1021 (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1022 "\", line " (group (1+ digit)))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1023 1 2) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1024 (,(rx (and " in file " (group (1+ not-newline)) " on line " |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1025 (group (1+ digit)))) |
55300
2db456741f80
(python-compilation-line-number): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55240
diff
changeset
|
1026 1 2)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1027 "`compilation-error-regexp-alist' for inferior Python.") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1028 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1029 (defvar inferior-python-mode-map |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1030 (let ((map (make-sparse-keymap))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1031 ;; This will inherit from comint-mode-map. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1032 (define-key map "\C-c\C-l" 'python-load-file) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1033 (define-key map "\C-c\C-v" 'python-check) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1034 ;; Note that we _can_ still use these commands which send to the |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1035 ;; Python process even at the prompt iff we have a normal prompt, |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1036 ;; i.e. '>>> ' and not '... '. See the comment before |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1037 ;; python-send-region. Fixme: uncomment these if we address that. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1038 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1039 ;; (define-key map [(meta ?\t)] 'python-complete-symbol) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1040 ;; (define-key map "\C-c\C-f" 'python-describe-symbol) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1041 map)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1042 |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1043 ;; Fixme: This should inherit some stuff from python-mode, but I'm not |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1044 ;; sure how much: at least some keybindings, like C-c C-f; syntax?; |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1045 ;; font-locking, e.g. for triple-quoted strings? |
54789 | 1046 (define-derived-mode inferior-python-mode comint-mode "Inferior Python" |
1047 "Major mode for interacting with an inferior Python process. | |
1048 A Python process can be started with \\[run-python]. | |
1049 | |
1050 Hooks `comint-mode-hook' and `inferior-python-mode-hook' are run in | |
1051 that order. | |
1052 | |
1053 You can send text to the inferior Python process from other buffers containing | |
1054 Python source. | |
1055 * `python-switch-to-python' switches the current buffer to the Python | |
1056 process buffer. | |
1057 * `python-send-region' sends the current region to the Python process. | |
1058 * `python-send-region-and-go' switches to the Python process buffer | |
1059 after sending the text. | |
1060 For running multiple processes in multiple buffers, see `python-buffer'. | |
1061 | |
1062 \\{inferior-python-mode-map}" | |
1063 :group 'python | |
1064 (set-syntax-table python-mode-syntax-table) | |
1065 (setq mode-line-process '(":%s")) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1066 (set (make-local-variable 'comint-input-filter) 'python-input-filter) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1067 (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1068 nil t) |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1069 ;; Still required by `comint-redirect-send-command', for instance |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1070 ;; (and we need to match things like `>>> ... >>> '): |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1071 (set (make-local-variable 'comint-prompt-regexp) |
64049
69990675200d
(python): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63831
diff
changeset
|
1072 (rx (and line-start (1+ (and (repeat 3 (any ">.")) ?\s))))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1073 (set (make-local-variable 'compilation-error-regexp-alist) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1074 python-compilation-regexp-alist) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1075 (compilation-shell-minor-mode 1)) |
54789 | 1076 |
1077 (defcustom inferior-python-filter-regexp "\\`\\s-*\\S-?\\S-?\\s-*\\'" | |
1078 "*Input matching this regexp is not saved on the history list. | |
1079 Default ignores all inputs of 0, 1, or 2 non-blank characters." | |
1080 :type 'regexp | |
1081 :group 'python) | |
1082 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1083 (defun python-input-filter (str) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1084 "`comint-input-filter' function for inferior Python. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1085 Don't save anything for STR matching `inferior-python-filter-regexp'." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1086 (not (string-match inferior-python-filter-regexp str))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1087 |
54789 | 1088 ;; Fixme: Loses with quoted whitespace. |
1089 (defun python-args-to-list (string) | |
1090 (let ((where (string-match "[ \t]" string))) | |
1091 (cond ((null where) (list string)) | |
1092 ((not (= where 0)) | |
1093 (cons (substring string 0 where) | |
1094 (python-args-to-list (substring string (+ 1 where))))) | |
1095 (t (let ((pos (string-match "[^ \t]" string))) | |
1096 (if pos (python-args-to-list (substring string pos)))))))) | |
1097 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1098 (defvar python-preoutput-result nil |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1099 "Data from last `_emacs_out' line seen by the preoutput filter.") |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1100 |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1101 (defvar python-preoutput-continuation nil |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1102 "If non-nil, funcall this when `python-preoutput-filter' sees `_emacs_ok'.") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1103 |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1104 (defvar python-preoutput-leftover nil) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1105 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1106 ;; Using this stops us getting lines in the buffer like |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1107 ;; >>> ... ... >>> |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1108 ;; Also look for (and delete) an `_emacs_ok' string and call |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1109 ;; `python-preoutput-continuation' if we get it. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1110 (defun python-preoutput-filter (s) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1111 "`comint-preoutput-filter-functions' function: ignore prompts not at bol." |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1112 (when python-preoutput-leftover |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1113 (setq s (concat python-preoutput-leftover s)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1114 (setq python-preoutput-leftover nil)) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1115 (cond ((and (string-match (rx (and string-start (repeat 3 (any ".>")) |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1116 " " string-end)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1117 s) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1118 (/= (let ((inhibit-field-text-motion t)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1119 (line-beginning-position)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1120 (point))) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1121 "") |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1122 ((string= s "_emacs_ok\n") |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1123 (when python-preoutput-continuation |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1124 (funcall python-preoutput-continuation) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1125 (setq python-preoutput-continuation nil)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1126 "") |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1127 ((string-match "_emacs_out \\(.*\\)\n" s) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1128 (setq python-preoutput-result (match-string 1 s)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1129 "") |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1130 ((string-match ".*\n" s) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1131 s) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1132 ((or (eq t (compare-strings s nil nil "_emacs_ok\n" nil (length s))) |
61086
bf4917ef8f38
(python-preoutput-filter): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61037
diff
changeset
|
1133 (let ((end (min (length "_emacs_out ") (length s)))) |
bf4917ef8f38
(python-preoutput-filter): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
61037
diff
changeset
|
1134 (eq t (compare-strings s nil end "_emacs_out " nil end)))) |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1135 (setq python-preoutput-leftover s) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1136 "") |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1137 (t s))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1138 |
54789 | 1139 ;;;###autoload |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1140 (defun run-python (&optional cmd noshow) |
54789 | 1141 "Run an inferior Python process, input and output via buffer *Python*. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1142 CMD is the Python command to run. NOSHOW non-nil means don't show the |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1143 buffer automatically. |
54789 | 1144 If there is a process already running in `*Python*', switch to |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1145 that buffer. Interactively, a prefix arg allows you to edit the initial |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1146 command line (default is `python-command'); `-i' etc. args will be added |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1147 to this as appropriate. Runs the hook `inferior-python-mode-hook' |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1148 \(after the `comint-mode-hook' is run). |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1149 \(Type \\[describe-mode] in the process buffer for a list of commands.)" |
54789 | 1150 (interactive (list (if current-prefix-arg |
1151 (read-string "Run Python: " python-command) | |
1152 python-command))) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1153 (unless cmd (setq cmd python-python-command)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1154 (setq python-command cmd) |
54789 | 1155 ;; Fixme: Consider making `python-buffer' buffer-local as a buffer |
1156 ;; (not a name) in Python buffers from which `run-python' &c is | |
1157 ;; invoked. Would support multiple processes better. | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1158 (unless (comint-check-proc python-buffer) |
55511
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1159 (let* ((cmdlist (append (python-args-to-list cmd) '("-i"))) |
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1160 (path (getenv "PYTHONPATH")) |
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1161 (process-environment ; to import emacs.py |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1162 (cons (concat "PYTHONPATH=" data-directory |
55511
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1163 (if path (concat ":" path))) |
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1164 process-environment))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1165 (set-buffer (apply 'make-comint "Python" (car cmdlist) nil |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1166 (cdr cmdlist))) |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1167 (setq python-buffer (buffer-name))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1168 (inferior-python-mode) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1169 ;; Load function defintions we need. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1170 ;; Before the preoutput function was used, this was done via -c in |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1171 ;; cmdlist, but that loses the banner and doesn't run the startup |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1172 ;; file. The code might be inline here, but there's enough that it |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1173 ;; seems worth putting in a separate file, and it's probably cleaner |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1174 ;; to put it in a module. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1175 (python-send-string "import emacs")) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1176 (unless noshow (pop-to-buffer python-buffer))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1177 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1178 ;; Fixme: We typically lose if the inferior isn't in the normal REPL, |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1179 ;; e.g. prompt is `help> '. Probably raise an error if the form of |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1180 ;; the prompt is unexpected; actually, it needs to be `>>> ', not |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1181 ;; `... ', i.e. we're not inputting a block &c. However, this may not |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1182 ;; be the place to do it, e.g. we might actually want to send commands |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1183 ;; having set up such a state. |
54789 | 1184 |
55240
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1185 (defun python-send-command (command) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1186 "Like `python-send-string' but resets `compilation-minor-mode'." |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1187 (goto-char (point-max)) |
55240
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1188 (let ((end (marker-position (process-mark (python-proc))))) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1189 (compilation-forget-errors) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1190 (python-send-string command) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1191 (set-marker compilation-parsing-end end) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1192 (setq compilation-last-buffer (current-buffer)))) |
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1193 |
54789 | 1194 (defun python-send-region (start end) |
1195 "Send the region to the inferior Python process." | |
1196 ;; The region is evaluated from a temporary file. This avoids | |
1197 ;; problems with blank lines, which have different semantics | |
1198 ;; interactively and in files. It also saves the inferior process | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1199 ;; buffer filling up with interpreter prompts. We need a Python |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1200 ;; function to remove the temporary file when it has been evaluated |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1201 ;; (though we could probably do it in Lisp with a Comint output |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1202 ;; filter). This function also catches exceptions and truncates |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1203 ;; tracebacks not to mention the frame of the function itself. |
54789 | 1204 ;; |
1205 ;; The compilation-minor-mode parsing takes care of relating the | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1206 ;; reference to the temporary file to the source. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1207 ;; |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1208 ;; Fixme: Write a `coding' header to the temp file if the region is |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1209 ;; non-ASCII. |
54789 | 1210 (interactive "r") |
1211 (let* ((f (make-temp-file "py")) | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1212 (command (format "emacs.eexecfile(%S)" f)) |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
1213 (orig-start (copy-marker start))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1214 (when (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1215 (goto-char start) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1216 (/= 0 (current-indentation))) ; need dummy block |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1217 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1218 (goto-char orig-start) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1219 ;; Wrong if we had indented code at buffer start. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1220 (set-marker orig-start (line-beginning-position 0))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1221 (write-region "if True:\n" nil f nil 'nomsg)) |
54789 | 1222 (write-region start end f t 'nomsg) |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1223 (with-current-buffer (process-buffer (python-proc)) ;Runs python if needed. |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1224 (python-send-command command) |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1225 ;; Tell compile.el to redirect error locations in file `f' to |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1226 ;; positions past marker `orig-start'. It has to be done *after* |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1227 ;; python-send-command's call to compilation-forget-errors. |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1228 (compilation-fake-loc orig-start f)))) |
54789 | 1229 |
1230 (defun python-send-string (string) | |
1231 "Evaluate STRING in inferior Python process." | |
1232 (interactive "sPython command: ") | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1233 (comint-send-string (python-proc) string) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1234 (comint-send-string (python-proc) "\n\n")) |
54789 | 1235 |
1236 (defun python-send-buffer () | |
1237 "Send the current buffer to the inferior Python process." | |
1238 (interactive) | |
1239 (python-send-region (point-min) (point-max))) | |
1240 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1241 ;; Fixme: Try to define the function or class within the relevant |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1242 ;; module, not just at top level. |
54789 | 1243 (defun python-send-defun () |
1244 "Send the current defun (class or method) to the inferior Python process." | |
1245 (interactive) | |
1246 (save-excursion (python-send-region (progn (beginning-of-defun) (point)) | |
1247 (progn (end-of-defun) (point))))) | |
1248 | |
1249 (defun python-switch-to-python (eob-p) | |
1250 "Switch to the Python process buffer. | |
1251 With prefix arg, position cursor at end of buffer." | |
1252 (interactive "P") | |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1253 (pop-to-buffer (process-buffer (python-proc))) ;Runs python if needed. |
54789 | 1254 (when eob-p |
1255 (push-mark) | |
1256 (goto-char (point-max)))) | |
1257 | |
1258 (defun python-send-region-and-go (start end) | |
1259 "Send the region to the inferior Python process. | |
1260 Then switch to the process buffer." | |
1261 (interactive "r") | |
1262 (python-send-region start end) | |
1263 (python-switch-to-python t)) | |
1264 | |
1265 (defcustom python-source-modes '(python-mode jython-mode) | |
1266 "*Used to determine if a buffer contains Python source code. | |
1267 If it's loaded into a buffer that is in one of these major modes, it's | |
1268 considered a Python source file by `python-load-file'. | |
1269 Used by these commands to determine defaults." | |
1270 :type '(repeat function) | |
1271 :group 'python) | |
1272 | |
1273 (defvar python-prev-dir/file nil | |
1274 "Caches (directory . file) pair used in the last `python-load-file' command. | |
1275 Used for determining the default in the next one.") | |
1276 | |
1277 (defun python-load-file (file-name) | |
1278 "Load a Python file FILE-NAME into the inferior Python process. | |
1279 If the file has extension `.py' import or reload it as a module. | |
1280 Treating it as a module keeps the global namespace clean, provides | |
1281 function location information for debugging, and supports users of | |
1282 module-qualified names." | |
1283 (interactive (comint-get-source "Load Python file: " python-prev-dir/file | |
1284 python-source-modes | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1285 t)) ; because execfile needs exact name |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1286 (comint-check-source file-name) ; Check to see if buffer needs saving. |
54789 | 1287 (setq python-prev-dir/file (cons (file-name-directory file-name) |
1288 (file-name-nondirectory file-name))) | |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1289 (with-current-buffer (process-buffer (python-proc)) ;Runs python if needed. |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1290 ;; Fixme: I'm not convinced by this logic from python-mode.el. |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1291 (python-send-command |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1292 (if (string-match "\\.py\\'" file-name) |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1293 (let ((module (file-name-sans-extension |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1294 (file-name-nondirectory file-name)))) |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1295 (format "emacs.eimport(%S,%S)" |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1296 module (file-name-directory file-name))) |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1297 (format "execfile(%S)" file-name))) |
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1298 (message "%s loaded" file-name))) |
54789 | 1299 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1300 ;; Fixme: If we need to start the process, wait until we've got the OK |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1301 ;; from the startup. |
54789 | 1302 (defun python-proc () |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1303 "Return the current Python process. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1304 See variable `python-buffer'. Starts a new process if necessary." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1305 (or (if python-buffer |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1306 (get-buffer-process (if (eq major-mode 'inferior-python-mode) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1307 (current-buffer) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1308 python-buffer))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1309 (progn (run-python nil t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1310 (python-proc)))) |
54789 | 1311 |
1312 ;;;; Context-sensitive help. | |
1313 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1314 (defconst python-dotty-syntax-table |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1315 (let ((table (make-syntax-table))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1316 (set-char-table-parent table python-mode-syntax-table) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1317 (modify-syntax-entry ?. "_" table) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1318 table) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1319 "Syntax table giving `.' symbol syntax. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1320 Otherwise inherits from `python-mode-syntax-table'.") |
54789 | 1321 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1322 (defvar view-return-to-alist) |
55511
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1323 (eval-when-compile (autoload 'help-buffer "help-fns")) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1324 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1325 ;; Fixme: Should this actually be used instead of info-look, i.e. be |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1326 ;; bound to C-h S? Can we use other pydoc stuff before python 2.2? |
54789 | 1327 (defun python-describe-symbol (symbol) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1328 "Get help on SYMBOL using `help'. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1329 Interactively, prompt for symbol. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1330 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1331 Symbol may be anything recognized by the interpreter's `help' command -- |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1332 e.g. `CALLS' -- not just variables in scope. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1333 This only works for Python version 2.2 or newer since earlier interpreters |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1334 don't support `help'." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1335 ;; Note that we do this in the inferior process, not a separate one, to |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1336 ;; ensure the environment is appropriate. |
54789 | 1337 (interactive |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1338 (let ((symbol (with-syntax-table python-dotty-syntax-table |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1339 (current-word))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1340 (enable-recursive-minibuffers t)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1341 (list (read-string (if symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1342 (format "Describe symbol (default %s): " symbol) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1343 "Describe symbol: ") |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1344 nil nil symbol)))) |
54789 | 1345 (if (equal symbol "") (error "No symbol")) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1346 (let* ((func `(lambda () |
65672
e60ed2bd9d3d
(python-describe-symbol): Add globals() and locals() to the arguments
Eli Zaretskii <eliz@gnu.org>
parents:
65175
diff
changeset
|
1347 (comint-redirect-send-command |
e60ed2bd9d3d
(python-describe-symbol): Add globals() and locals() to the arguments
Eli Zaretskii <eliz@gnu.org>
parents:
65175
diff
changeset
|
1348 (format "emacs.ehelp(%S, globals(), locals())\n" ,symbol) |
e60ed2bd9d3d
(python-describe-symbol): Add globals() and locals() to the arguments
Eli Zaretskii <eliz@gnu.org>
parents:
65175
diff
changeset
|
1349 "*Help*" nil)))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1350 ;; Ensure we have a suitable help buffer. |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1351 ;; Fixme: Maybe process `Related help topics' a la help xrefs and |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1352 ;; allow C-c C-f in help buffer. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1353 (let ((temp-buffer-show-hook ; avoid xref stuff |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1354 (lambda () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1355 (toggle-read-only 1) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1356 (setq view-return-to-alist |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1357 (list (cons (selected-window) help-return-method)))))) |
55447
f1b7359315f0
(python-describe-symbol): Pass INTERACTIVE-P argument to `help-setup-xref'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55397
diff
changeset
|
1358 (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p)) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1359 (with-output-to-temp-buffer (help-buffer) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1360 (with-current-buffer standard-output |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1361 (set (make-local-variable 'comint-redirect-subvert-readonly) t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1362 (print-help-return-message)))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1363 (if (and python-buffer (get-buffer python-buffer)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1364 (with-current-buffer python-buffer |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1365 (funcall func)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1366 (setq python-preoutput-continuation func) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1367 (run-python nil t)))) |
54789 | 1368 |
1369 (add-to-list 'debug-ignored-errors "^No symbol") | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1370 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1371 (defun python-send-receive (string) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1372 "Send STRING to inferior Python (if any) and return result. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1373 The result is what follows `_emacs_out' in the output (or nil)." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1374 (let ((proc (python-proc))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1375 (python-send-string string) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1376 (setq python-preoutput-result nil) |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1377 (while (progn |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1378 (accept-process-output proc 5) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1379 python-preoutput-leftover)) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1380 python-preoutput-result)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1381 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1382 ;; Fixme: try to make it work with point in the arglist. Also, is |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1383 ;; there anything reasonable we can do with random methods? |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1384 ;; (Currently only works with functions.) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1385 (defun python-eldoc-function () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1386 "`eldoc-print-current-symbol-info' for Python. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1387 Only works when point is in a function name, not its arglist, for instance. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1388 Assumes an inferior Python is running." |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1389 (let ((symbol (with-syntax-table python-dotty-syntax-table |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1390 (current-word)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1391 (when symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1392 (python-send-receive (format "emacs.eargs(%S)" symbol))))) |
54789 | 1393 |
1394 ;;;; Info-look functionality. | |
1395 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1396 (defun python-after-info-look () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1397 "Set up info-look for Python. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1398 Used with `eval-after-load'." |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1399 (let* ((version (let ((s (shell-command-to-string (concat python-command |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1400 " -V")))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1401 (string-match "^Python \\([0-9]+\\.[0-9]+\\>\\)" s) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1402 (match-string 1 s))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1403 ;; Whether info files have a Python version suffix, e.g. in Debian. |
55447
f1b7359315f0
(python-describe-symbol): Pass INTERACTIVE-P argument to `help-setup-xref'.
Juanma Barranquero <lekktu@gmail.com>
parents:
55397
diff
changeset
|
1404 (versioned |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1405 (with-temp-buffer |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1406 (with-no-warnings (Info-mode)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1407 (condition-case () |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
1408 ;; Don't use `info' because it would pop-up a *info* buffer. |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1409 (with-no-warnings |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1410 (Info-goto-node (format "(python%s-lib)Miscellaneous Index" |
55511
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1411 version)) |
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1412 t) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1413 (error nil))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1414 (info-lookup-maybe-add-help |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1415 :mode 'python-mode |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1416 :regexp "[[:alnum:]_]+" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1417 :doc-spec |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1418 ;; Fixme: Can this reasonably be made specific to indices with |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1419 ;; different rules? Is the order of indices optimal? |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1420 ;; (Miscellaneous in -ref first prefers lookup of keywords, for |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1421 ;; instance.) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1422 (if versioned |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1423 ;; The empty prefix just gets us highlighted terms. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1424 `((,(concat "(python" version "-ref)Miscellaneous Index") nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1425 (,(concat "(python" version "-ref)Module Index" nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1426 (,(concat "(python" version "-ref)Function-Method-Variable Index" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1427 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1428 (,(concat "(python" version "-ref)Class-Exception-Object Index" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1429 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1430 (,(concat "(python" version "-lib)Module Index" nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1431 (,(concat "(python" version "-lib)Class-Exception-Object Index" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1432 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1433 (,(concat "(python" version "-lib)Function-Method-Variable Index" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1434 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1435 (,(concat "(python" version "-lib)Miscellaneous Index" nil ""))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1436 '(("(python-ref)Miscellaneous Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1437 ("(python-ref)Module Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1438 ("(python-ref)Function-Method-Variable Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1439 ("(python-ref)Class-Exception-Object Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1440 ("(python-lib)Module Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1441 ("(python-lib)Class-Exception-Object Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1442 ("(python-lib)Function-Method-Variable Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1443 ("(python-lib)Miscellaneous Index" nil "")))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1444 (eval-after-load "info-look" '(python-after-info-look)) |
54789 | 1445 |
1446 ;;;; Miscellancy. | |
1447 | |
1448 (defcustom python-jython-packages '("java" "javax" "org" "com") | |
1449 "Packages implying `jython-mode'. | |
1450 If these are imported near the beginning of the buffer, `python-mode' | |
1451 actually punts to `jython-mode'." | |
1452 :type '(repeat string) | |
1453 :group 'python) | |
1454 | |
1455 ;; Called from `python-mode', this causes a recursive call of the | |
1456 ;; mode. See logic there to break out of the recursion. | |
1457 (defun python-maybe-jython () | |
1458 "Invoke `jython-mode' if the buffer appears to contain Jython code. | |
1459 The criterion is either a match for `jython-mode' via | |
1460 `interpreter-mode-alist' or an import of a module from the list | |
1461 `python-jython-packages'." | |
1462 ;; The logic is taken from python-mode.el. | |
1463 (save-excursion | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1464 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1465 (widen) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1466 (goto-char (point-min)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1467 (let ((interpreter (if (looking-at auto-mode-interpreter-regexp) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1468 (match-string 2)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1469 (if (and interpreter (eq 'jython-mode |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1470 (cdr (assoc (file-name-nondirectory |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1471 interpreter) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1472 interpreter-mode-alist)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1473 (jython-mode) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1474 (if (catch 'done |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1475 (while (re-search-forward |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1476 (rx (and line-start (or "import" "from") (1+ space) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1477 (group (1+ (not (any " \t\n.")))))) |
55054
ee7e5daa7ffd
(python-maybe-jython): Don't assume point-min==1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54943
diff
changeset
|
1478 (+ (point-min) 10000) ; Probably not worth customizing. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1479 t) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1480 (if (member (match-string 1) python-jython-packages) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1481 (throw 'done t)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1482 (jython-mode))))))) |
54789 | 1483 |
1484 (defun python-fill-paragraph (&optional justify) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1485 "`fill-paragraph-function' handling comments and multi-line strings. |
54789 | 1486 If any of the current line is a comment, fill the comment or the |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1487 paragraph of it that point is in, preserving the comment's |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1488 indentation and initial comment characters. Similarly if the end |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1489 of the current line is in or at the end of a multi-line string. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1490 Otherwise, do nothing." |
54789 | 1491 (interactive "P") |
1492 (or (fill-comment-paragraph justify) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1493 ;; The `paragraph-start' and `paragraph-separate' variables |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1494 ;; don't allow us to delimit the last paragraph in a multi-line |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1495 ;; string properly, so narrow to the string and then fill around |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1496 ;; (the end of) the current line. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1497 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1498 (end-of-line) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1499 (let* ((syntax (syntax-ppss)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1500 (orig (point)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1501 (start (nth 8 syntax)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1502 end) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1503 (cond ((eq t (nth 3 syntax)) ; in fenced string |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1504 (goto-char (nth 8 syntax)) ; string start |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1505 (condition-case () ; for unbalanced quotes |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1506 (progn (forward-sexp) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1507 (setq end (point))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1508 (error (setq end (point-max))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1509 ((re-search-backward "\\s|\\s-*\\=" nil t) ; end of fenced |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1510 ; string |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1511 (forward-char) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1512 (setq end (point)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1513 (condition-case () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1514 (progn (backward-sexp) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1515 (setq start (point))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1516 (error nil)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1517 (when end |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1518 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1519 (narrow-to-region start end) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1520 (goto-char orig) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1521 (fill-paragraph justify)))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1522 t) |
54789 | 1523 |
1524 (defun python-shift-left (start end &optional count) | |
1525 "Shift lines in region COUNT (the prefix arg) columns to the left. | |
1526 COUNT defaults to `python-indent'. If region isn't active, just shift | |
1527 current line. The region shifted includes the lines in which START and | |
1528 END lie. It is an error if any lines in the region are indented less than | |
1529 COUNT columns." | |
1530 (interactive (if mark-active | |
1531 (list (region-beginning) (region-end) current-prefix-arg) | |
1532 (list (point) (point) current-prefix-arg))) | |
1533 (if count | |
1534 (setq count (prefix-numeric-value count)) | |
1535 (setq count python-indent)) | |
1536 (when (> count 0) | |
1537 (save-excursion | |
1538 (goto-char start) | |
1539 (while (< (point) end) | |
1540 (if (and (< (current-indentation) count) | |
1541 (not (looking-at "[ \t]*$"))) | |
1542 (error "Can't shift all lines enough")) | |
1543 (forward-line)) | |
1544 (indent-rigidly start end (- count))))) | |
1545 | |
1546 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") | |
1547 | |
1548 (defun python-shift-right (start end &optional count) | |
1549 "Shift lines in region COUNT (the prefix arg) columns to the right. | |
1550 COUNT defaults to `python-indent'. If region isn't active, just shift | |
1551 current line. The region shifted includes the lines in which START and | |
1552 END lie." | |
1553 (interactive (if mark-active | |
1554 (list (region-beginning) (region-end) current-prefix-arg) | |
1555 (list (point) (point) current-prefix-arg))) | |
1556 (if count | |
1557 (setq count (prefix-numeric-value count)) | |
1558 (setq count python-indent)) | |
1559 (indent-rigidly start end count)) | |
1560 | |
1561 (defun python-outline-level () | |
1562 "`outline-level' function for Python mode. | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1563 The level is the number of `python-indent' steps of indentation |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1564 of current line." |
54789 | 1565 (/ (current-indentation) python-indent)) |
1566 | |
1567 ;; Fixme: Consider top-level assignments, imports, &c. | |
1568 (defun python-current-defun () | |
1569 "`add-log-current-defun-function' for Python." | |
1570 (save-excursion | |
1571 ;; Move up the tree of nested `class' and `def' blocks until we | |
1572 ;; get to zero indentation, accumulating the defined names. | |
1573 (let ((start t) | |
1574 accum) | |
1575 (while (or start (> (current-indentation) 0)) | |
1576 (setq start nil) | |
1577 (python-beginning-of-block) | |
1578 (end-of-line) | |
1579 (beginning-of-defun) | |
1580 (if (looking-at (rx (and (0+ space) (or "def" "class") (1+ space) | |
1581 (group (1+ (or word (syntax symbol)))) | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
1582 ;; Greediness makes this unnecessary? --Stef |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
1583 symbol-end))) |
54789 | 1584 (push (match-string 1) accum))) |
1585 (if accum (mapconcat 'identity accum "."))))) | |
1586 | |
1587 (defun python-mark-block () | |
1588 "Mark the block around point. | |
1589 Uses `python-beginning-of-block', `python-end-of-block'." | |
1590 (interactive) | |
1591 (push-mark) | |
1592 (python-beginning-of-block) | |
1593 (push-mark (point) nil t) | |
1594 (python-end-of-block) | |
1595 (exchange-point-and-mark)) | |
1596 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1597 ;;;; Completion. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1598 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1599 (defun python-symbol-completions (symbol) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1600 "Return a list of completions of the string SYMBOL from Python process. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1601 The list is sorted." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1602 (when symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1603 (let ((completions |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1604 (condition-case () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1605 (car (read-from-string (python-send-receive |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1606 (format "emacs.complete(%S)" symbol)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1607 (error nil)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1608 (sort |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1609 ;; We can get duplicates from the above -- don't know why. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1610 (delete-dups completions) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1611 #'string<)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1612 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1613 (defun python-partial-symbol () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1614 "Return the partial symbol before point (for completion)." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1615 (let ((end (point)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1616 (start (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1617 (and (re-search-backward |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1618 (rx (and (or buffer-start (regexp "[^[:alnum:]._]")) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1619 (group (1+ (regexp "[[:alnum:]._]"))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1620 point)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1621 nil t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1622 (match-beginning 1))))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1623 (if start (buffer-substring-no-properties start end)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1624 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1625 ;; Fixme: We should have an abstraction of this sort of thing in the |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1626 ;; core. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1627 (defun python-complete-symbol () |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1628 "Perform completion on the Python symbol preceding point. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1629 Repeating the command scrolls the completion window." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1630 (interactive) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1631 (let ((window (get-buffer-window "*Completions*"))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1632 (if (and (eq last-command this-command) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1633 window (window-live-p window) (window-buffer window) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1634 (buffer-name (window-buffer window))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1635 (with-current-buffer (window-buffer window) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1636 (if (pos-visible-in-window-p (point-max) window) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1637 (set-window-start window (point-min)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1638 (save-selected-window |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1639 (select-window window) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1640 (scroll-up)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1641 ;; Do completion. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1642 (let* ((end (point)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1643 (symbol (python-partial-symbol)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1644 (completions (python-symbol-completions symbol)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1645 (completion (if completions |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1646 (try-completion symbol completions)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1647 (when symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1648 (cond ((eq completion t)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1649 ((null completion) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1650 (message "Can't find completion for \"%s\"" symbol) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1651 (ding)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1652 ((not (string= symbol completion)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1653 (delete-region (- end (length symbol)) end) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1654 (insert completion)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1655 (t |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1656 (message "Making completion list...") |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1657 (with-output-to-temp-buffer "*Completions*" |
66178
6c46e0e1ba7b
Install to the CVS repository what I forgot to install in my
Masatake YAMATO <jet@gyve.org>
parents:
65672
diff
changeset
|
1658 (display-completion-list completions symbol)) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1659 (message "Making completion list...%s" "done")))))))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1660 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1661 (eval-when-compile (require 'hippie-exp)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1662 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1663 (defun python-try-complete (old) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1664 "Completion function for Python for use with `hippie-expand'." |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1665 (when (eq major-mode 'python-mode) ; though we only add it locally |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1666 (unless old |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1667 (let ((symbol (python-partial-symbol))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1668 (he-init-string (- (point) (length symbol)) (point)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1669 (if (not (he-string-member he-search-string he-tried-table)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1670 (push he-search-string he-tried-table)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1671 (setq he-expand-list |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1672 (and symbol (python-symbol-completions symbol))))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1673 (while (and he-expand-list |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1674 (he-string-member (car he-expand-list) he-tried-table)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1675 (pop he-expand-list)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1676 (if he-expand-list |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1677 (progn |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1678 (he-substitute-string (pop he-expand-list)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1679 t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1680 (if old (he-reset-string)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1681 nil))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1682 |
54789 | 1683 ;;;; Modes. |
1684 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1685 (defvar outline-heading-end-regexp) |
61857
7b4e7e55f61b
(python-mode): Use new name eldoc-documentation-function.
Richard M. Stallman <rms@gnu.org>
parents:
61086
diff
changeset
|
1686 (defvar eldoc-documentation-function) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1687 |
54789 | 1688 ;;;###autoload |
1689 (define-derived-mode python-mode fundamental-mode "Python" | |
1690 "Major mode for editing Python files. | |
1691 Turns on Font Lock mode unconditionally since it is required for correct | |
1692 parsing of the source. | |
1693 See also `jython-mode', which is actually invoked if the buffer appears to | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1694 contain Jython code. See also `run-python' and associated Python mode |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1695 commands for running Python under Emacs. |
54789 | 1696 |
1697 The Emacs commands which work with `defun's, e.g. \\[beginning-of-defun], deal | |
1698 with nested `def' and `class' blocks. They take the innermost one as | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1699 current without distinguishing method and class definitions. Used multiple |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1700 times, they move over others at the same indentation level until they reach |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1701 the end of definitions at that level, when they move up a level. |
54789 | 1702 \\<python-mode-map> |
1703 Colon is electric: it outdents the line if appropriate, e.g. for | |
1704 an else statement. \\[python-backspace] at the beginning of an indented statement | |
1705 deletes a level of indentation to close the current block; otherwise it | |
1706 deletes a charcter backward. TAB indents the current line relative to | |
1707 the preceding code. Successive TABs, with no intervening command, cycle | |
1708 through the possibilities for indentation on the basis of enclosing blocks. | |
1709 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1710 \\[fill-paragraph] fills comments and multiline strings appropriately, but has no |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1711 effect outside them. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1712 |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1713 Supports Eldoc mode (only for functions, using a Python process), |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1714 Info-Look and Imenu. In Outline minor mode, `class' and `def' |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1715 lines count as headers. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1716 |
54789 | 1717 \\{python-mode-map}" |
1718 :group 'python | |
1719 (set (make-local-variable 'font-lock-defaults) | |
1720 '(python-font-lock-keywords nil nil ((?_ . "w")) nil | |
1721 (font-lock-syntactic-keywords | |
1722 . python-font-lock-syntactic-keywords) | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
1723 ;; This probably isn't worth it. |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
1724 ;; (font-lock-syntactic-face-function |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
1725 ;; . python-font-lock-syntactic-face-function) |
54789 | 1726 )) |
1727 (set (make-local-variable 'parse-sexp-lookup-properties) t) | |
1728 (set (make-local-variable 'comment-start) "# ") | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1729 (set (make-local-variable 'comment-indent-function) #'python-comment-indent) |
54789 | 1730 (set (make-local-variable 'indent-line-function) #'python-indent-line) |
1731 (set (make-local-variable 'paragraph-start) "\\s-*$") | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1732 (set (make-local-variable 'fill-paragraph-function) 'python-fill-paragraph) |
59250
54d81a8baaa6
(python-mode): Use mode-require-final-newline.
Richard M. Stallman <rms@gnu.org>
parents:
58739
diff
changeset
|
1733 (set (make-local-variable 'require-final-newline) mode-require-final-newline) |
54789 | 1734 (set (make-local-variable 'add-log-current-defun-function) |
1735 #'python-current-defun) | |
1736 ;; Fixme: Generalize to do all blocks? | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1737 (set (make-local-variable 'outline-regexp) "\\s-*\\(def\\|class\\)\\>") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1738 (set (make-local-variable 'outline-heading-end-regexp) ":\\s-*\n") |
54789 | 1739 (set (make-local-variable 'outline-level) #'python-outline-level) |
1740 (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil) | |
1741 (make-local-variable 'python-saved-check-command) | |
1742 (set (make-local-variable 'beginning-of-defun-function) | |
1743 'python-beginning-of-defun) | |
1744 (set (make-local-variable 'end-of-defun-function) 'python-end-of-defun) | |
1745 (setq imenu-create-index-function #'python-imenu-create-index) | |
61857
7b4e7e55f61b
(python-mode): Use new name eldoc-documentation-function.
Richard M. Stallman <rms@gnu.org>
parents:
61086
diff
changeset
|
1746 (set (make-local-variable 'eldoc-documentation-function) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1747 #'python-eldoc-function) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1748 (add-hook 'eldoc-mode-hook |
68311
8db317ab20fc
(python-mode) <eldoc-mode-hook>: Pass nil as the first arg to run-python.
Eli Zaretskii <eliz@gnu.org>
parents:
66178
diff
changeset
|
1749 '(lambda () (run-python nil t)) nil t) ; need it running |
70112
15278e681be3
(python-mode): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
70103
diff
changeset
|
1750 (unless (assoc 'python-mode hs-special-modes-alist) |
70103
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1751 (setq |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1752 hs-special-modes-alist |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1753 (cons (list |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1754 'python-mode "^\\s-*def\\>" nil "#" |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1755 (lambda (arg)(python-end-of-defun)(skip-chars-backward " \t\n")) |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1756 nil) |
4f0bc9ecc2a6
(python-mode): Add support for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
68773
diff
changeset
|
1757 hs-special-modes-alist))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1758 (if (featurep 'hippie-exp) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1759 (set (make-local-variable 'hippie-expand-try-functions-list) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1760 (cons 'python-try-complete hippie-expand-try-functions-list))) |
54789 | 1761 (when python-guess-indent (python-guess-indent)) |
1762 (set (make-local-variable 'python-command) python-python-command) | |
1763 (unless (boundp 'python-mode-running) ; kill the recursion from jython-mode | |
1764 (let ((python-mode-running t)) | |
1765 (python-maybe-jython)))) | |
1766 | |
1767 (custom-add-option 'python-mode-hook 'imenu-add-menubar-index) | |
1768 (custom-add-option 'python-mode-hook | |
1769 '(lambda () | |
1770 "Turn on Indent Tabs mode." | |
1771 (set (make-local-variable 'indent-tabs-mode) t))) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1772 (custom-add-option 'python-mode-hook 'turn-on-eldoc-mode) |
54789 | 1773 |
1774 ;;;###autoload | |
1775 (define-derived-mode jython-mode python-mode "Jython" | |
1776 "Major mode for editing Jython files. | |
1777 Like `python-mode', but sets up parameters for Jython subprocesses. | |
1778 Runs `jython-mode-hook' after `python-mode-hook'." | |
1779 :group 'python | |
1780 (set (make-local-variable 'python-command) python-jython-command)) | |
1781 | |
1782 (provide 'python) | |
1783 ;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554 | |
1784 ;;; python.el ends here |