Mercurial > emacs
annotate lisp/progmodes/python.el @ 76709:af7c3ea6462e
(Fgoto_char): Doc fix.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 24 Mar 2007 16:03:48 +0000 |
parents | 6e293ce14a97 |
children | e359709ed895 c0409ee15cee |
rev | line source |
---|---|
54789 | 1 ;;; python.el --- silly walks for Python |
2 | |
75347 | 3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007 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 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
54789 | 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 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
54789 | 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 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
64085 | 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 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
35 ;; simpler and is better in other ways. In particular, using the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
36 ;; syntax functions with text properties maintained by font-lock makes |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
37 ;; it more correct with arbitrary string and comment contents. |
54789 | 38 |
39 ;; This doesn't implement all the facilities of python-mode.el. Some | |
40 ;; 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
|
41 ;; buffer (but see M-x pdb for debugging). [Actually, the use of |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
42 ;; `compilation-shell-minor-mode' now is probably enough for that.] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
43 ;; Others don't seem appropriate. For instance, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
44 ;; `forward-into-nomenclature' should be done separately, since it's |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
45 ;; not specific to Python, and I've installed a minor mode to do the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
46 ;; job properly in Emacs 23. [CC mode 5.31 contains an incompatible |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
47 ;; feature, `c-subword-mode' which is intended to have a similar |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
48 ;; effect, but actually only affects word-oriented keybindings.] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
49 |
54789 | 50 ;; Other things seem more natural or canonical here, e.g. the |
51 ;; {beginning,end}-of-defun implementation dealing with nested | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
52 ;; definitions, and the inferior mode following `cmuscheme'. (The |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
53 ;; inferior mode can find the source of errors from |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
54 ;; `python-send-region' & al via `compilation-shell-minor-mode'.) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
55 ;; There is (limited) symbol completion using lookup in Python and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
56 ;; Eldoc support also using the inferior process. Successive TABs |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
57 ;; cycle between possible indentations for the line. |
54789 | 58 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
59 ;; Even where it has similar facilities, this mode is incompatible |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
60 ;; with python-mode.el in some respects. For instance, various key |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
61 ;; bindings are changed to obey Emacs conventions. |
54789 | 62 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
63 ;; TODO: See various Fixmes below. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
64 |
54789 | 65 ;;; Code: |
66 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
67 (eval-when-compile |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
68 (require 'cl) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
69 (require 'compile) |
72761
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
70 (require 'comint) |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
71 (require 'hippie-exp)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
72 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
73 (autoload 'comint-mode "comint") |
54789 | 74 |
75 (defgroup python nil | |
64049
69990675200d
(python): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63831
diff
changeset
|
76 "Silly walks in the Python language." |
54789 | 77 :group 'languages |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59250
diff
changeset
|
78 :version "22.1" |
54789 | 79 :link '(emacs-commentary-link "python")) |
80 | |
81 ;;;###autoload | |
82 (add-to-list 'interpreter-mode-alist '("jython" . jython-mode)) | |
83 ;;;###autoload | |
84 (add-to-list 'interpreter-mode-alist '("python" . python-mode)) | |
85 ;;;###autoload | |
86 (add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode)) | |
87 | |
88 ;;;; Font lock | |
89 | |
90 (defvar python-font-lock-keywords | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
91 `(,(rx symbol-start |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
92 ;; From v 2.4 reference. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
93 ;; def and class dealt with separately below |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
94 (or "and" "assert" "break" "continue" "del" "elif" "else" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
95 "except" "exec" "finally" "for" "from" "global" "if" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
96 "import" "in" "is" "lambda" "not" "or" "pass" "print" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
97 "raise" "return" "try" "while" "yield" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
98 ;; Future keywords |
72762
298499495f06
(python-font-lock-keywords): Add `self' and other quasi-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72761
diff
changeset
|
99 "as" "None" |
298499495f06
(python-font-lock-keywords): Add `self' and other quasi-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72761
diff
changeset
|
100 ;; Not real keywords, but close enough to be fontified as such |
298499495f06
(python-font-lock-keywords): Add `self' and other quasi-keywords.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72761
diff
changeset
|
101 "self" "True" "False") |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
102 symbol-end) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
103 ;; Definitions |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
104 (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
105 (1 font-lock-keyword-face) (2 font-lock-type-face)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
106 (,(rx symbol-start (group "def") (1+ space) (group (1+ (or word ?_)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
107 (1 font-lock-keyword-face) (2 font-lock-function-name-face)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
108 ;; Top-level assignments are worth highlighting. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
109 (,(rx line-start (group (1+ (or word ?_))) (0+ space) "=") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
110 (1 font-lock-variable-name-face)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
111 (,(rx "@" (1+ (or word ?_))) ; decorators |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
112 (0 font-lock-preprocessor-face)))) |
54789 | 113 |
114 (defconst python-font-lock-syntactic-keywords | |
115 ;; Make outer chars of matching triple-quote sequences into generic | |
116 ;; string delimiters. Fixme: Is there a better way? | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
117 `((,(rx (or line-start buffer-start |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
118 (not (syntax escape))) ; avoid escaped leading quote |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
119 (group (optional (any "uUrR"))) ; prefix gets syntax property |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
120 (optional (any "rR")) ; possible second prefix |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
121 (group (syntax string-quote)) ; maybe gets property |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
122 (backref 2) ; per first quote |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
123 (group (backref 2))) ; maybe gets property |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
124 (1 (python-quote-syntax 1)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
125 (2 (python-quote-syntax 2)) |
54789 | 126 (3 (python-quote-syntax 3))) |
127 ;; This doesn't really help. | |
128 ;;; (,(rx (and ?\\ (group ?\n))) (1 " ")) | |
129 )) | |
130 | |
131 (defun python-quote-syntax (n) | |
132 "Put `syntax-table' property correctly on triple quote. | |
133 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
|
134 ;; 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
|
135 ;; 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
|
136 ;; 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
|
137 ;; 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
|
138 ;; 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
|
139 ;; 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
|
140 ;; 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
|
141 |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
142 ;; Test cases: |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
143 ;; ur"""ar""" x='"' # """ |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
144 ;; x = ''' """ ' a |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
145 ;; ''' |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
146 ;; x '"""' x """ \"""" x |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
147 ;; Fixme: """""" goes wrong (due to syntax-ppss not getting the string |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
148 ;; fence context). |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
149 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
150 (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
|
151 (cond |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
152 ;; 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
|
153 ((= n 3) |
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
154 (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
|
155 (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
|
156 (goto-char (nth 8 syntax)) ; fence position |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
157 (skip-chars-forward "uUrR") ; skip any prefix |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
158 ;; 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
|
159 (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
|
160 (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
|
161 ;; Consider property for initial char, accounting for prefixes. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
162 ((or (and (= n 2) ; leading quote (not prefix) |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
163 (= (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
|
164 (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
|
165 (/= (match-beginning 1) (match-end 1)))) ; non-empty |
76255
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
166 (unless (nth 3 (syntax-ppss)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
167 (eval-when-compile (string-to-syntax "|")))) |
58487
d0581f1eef46
(python-font-lock-syntactic-keywords): Check for escapes in the regexp.
Richard M. Stallman <rms@gnu.org>
parents:
58415
diff
changeset
|
168 ;; 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
|
169 ;; 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
|
170 ))) |
54789 | 171 |
172 ;; This isn't currently in `font-lock-defaults' as probably not worth | |
173 ;; it -- we basically only mess with a few normally-symbol characters. | |
174 | |
175 ;; (defun python-font-lock-syntactic-face-function (state) | |
176 ;; "`font-lock-syntactic-face-function' for Python mode. | |
177 ;; Returns the string or comment face as usual, with side effect of putting | |
178 ;; a `syntax-table' property on the inside of the string or comment which is | |
179 ;; the standard syntax table." | |
180 ;; (if (nth 3 state) | |
181 ;; (save-excursion | |
182 ;; (goto-char (nth 8 state)) | |
183 ;; (condition-case nil | |
184 ;; (forward-sexp) | |
185 ;; (error nil)) | |
186 ;; (put-text-property (1+ (nth 8 state)) (1- (point)) | |
187 ;; 'syntax-table (standard-syntax-table)) | |
188 ;; 'font-lock-string-face) | |
189 ;; (put-text-property (1+ (nth 8 state)) (line-end-position) | |
190 ;; 'syntax-table (standard-syntax-table)) | |
191 ;; 'font-lock-comment-face)) | |
192 | |
193 ;;;; Keymap and syntax | |
194 | |
195 (defvar python-mode-map | |
196 (let ((map (make-sparse-keymap))) | |
197 ;; Mostly taken from python-mode.el. | |
198 (define-key map ":" 'python-electric-colon) | |
199 (define-key map "\177" 'python-backspace) | |
200 (define-key map "\C-c<" 'python-shift-left) | |
201 (define-key map "\C-c>" 'python-shift-right) | |
202 (define-key map "\C-c\C-k" 'python-mark-block) | |
203 (define-key map "\C-c\C-n" 'python-next-statement) | |
204 (define-key map "\C-c\C-p" 'python-previous-statement) | |
205 (define-key map "\C-c\C-u" 'python-beginning-of-block) | |
206 (define-key map "\C-c\C-f" 'python-describe-symbol) | |
207 (define-key map "\C-c\C-w" 'python-check) | |
208 (define-key map "\C-c\C-v" 'python-check) ; a la sgml-mode | |
209 (define-key map "\C-c\C-s" 'python-send-string) | |
210 (define-key map [?\C-\M-x] 'python-send-defun) | |
211 (define-key map "\C-c\C-r" 'python-send-region) | |
212 (define-key map "\C-c\M-r" 'python-send-region-and-go) | |
213 (define-key map "\C-c\C-c" 'python-send-buffer) | |
214 (define-key map "\C-c\C-z" 'python-switch-to-python) | |
215 (define-key map "\C-c\C-m" 'python-load-file) | |
216 (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
|
217 (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
|
218 map global-map) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
219 (define-key map "\C-c\C-i" 'python-find-imports) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
220 (define-key map "\C-c\C-t" 'python-expand-template) |
54789 | 221 (easy-menu-define python-menu map "Python Mode menu" |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
222 `("Python" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
223 :help "Python-specific Features" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
224 ["Shift region left" python-shift-left :active mark-active |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
225 :help "Shift by a single indentation step"] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
226 ["Shift region right" python-shift-right :active mark-active |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
227 :help "Shift by a single indentation step"] |
54789 | 228 "-" |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
229 ["Mark block" python-mark-block |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
230 :help "Mark innermost block around point"] |
54789 | 231 ["Mark def/class" mark-defun |
232 :help "Mark innermost definition around point"] | |
233 "-" | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
234 ["Start of block" python-beginning-of-block |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
235 :help "Go to start of innermost definition around point"] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
236 ["End of block" python-end-of-block |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
237 :help "Go to end of innermost definition around point"] |
54789 | 238 ["Start of def/class" beginning-of-defun |
239 :help "Go to start of innermost definition around point"] | |
240 ["End of def/class" end-of-defun | |
241 :help "Go to end of innermost definition around point"] | |
242 "-" | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
243 ("Templates..." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
244 :help "Expand templates for compound statements" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
245 :filter (lambda (&rest junk) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
246 (mapcar (lambda (elt) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
247 (vector (car elt) (cdr elt) t)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
248 python-skeletons))) ; defined later |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
249 "-" |
54789 | 250 ["Start interpreter" run-python |
251 :help "Run `inferior' Python in separate buffer"] | |
252 ["Import/reload file" python-load-file | |
253 :help "Load into inferior Python session"] | |
254 ["Eval buffer" python-send-buffer | |
255 :help "Evaluate buffer en bloc in inferior Python session"] | |
256 ["Eval region" python-send-region :active mark-active | |
257 :help "Evaluate region en bloc in inferior Python session"] | |
258 ["Eval def/class" python-send-defun | |
259 :help "Evaluate current definition in inferior Python session"] | |
260 ["Switch to interpreter" python-switch-to-python | |
261 :help "Switch to inferior Python buffer"] | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
262 ["Set default process" python-set-proc |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
263 :help "Make buffer's inferior process the default" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
264 :active (buffer-live-p python-buffer)] |
54789 | 265 ["Check file" python-check :help "Run pychecker"] |
266 ["Debugger" pdb :help "Run pdb under GUD"] | |
267 "-" | |
268 ["Help on symbol" python-describe-symbol | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
269 :help "Use pydoc on symbol at point"] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
270 ["Complete symbol" python-complete-symbol |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
271 :help "Complete (qualified) symbol before point"] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
272 ["Update imports" python-find-imports |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
273 :help "Update list of top-level imports for completion"])) |
54789 | 274 map)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
275 ;; Fixme: add toolbar stuff for useful things like symbol help, send |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
276 ;; region, at least. (Shouldn't be specific to Python, obviously.) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
277 ;; eric has items including: (un)indent, (un)comment, restart script, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
278 ;; run script, debug script; also things for profiling, unit testing. |
54789 | 279 |
280 (defvar python-mode-syntax-table | |
281 (let ((table (make-syntax-table))) | |
282 ;; Give punctuation syntax to ASCII that normally has symbol | |
283 ;; syntax or has word syntax and isn't a letter. | |
284 (let ((symbol (string-to-syntax "_")) | |
285 (sst (standard-syntax-table))) | |
286 (dotimes (i 128) | |
287 (unless (= i ?_) | |
288 (if (equal symbol (aref sst i)) | |
289 (modify-syntax-entry i "." table))))) | |
290 (modify-syntax-entry ?$ "." table) | |
291 (modify-syntax-entry ?% "." table) | |
292 ;; exceptions | |
293 (modify-syntax-entry ?# "<" table) | |
294 (modify-syntax-entry ?\n ">" table) | |
295 (modify-syntax-entry ?' "\"" table) | |
296 (modify-syntax-entry ?` "$" table) | |
297 table)) | |
298 | |
299 ;;;; Utility stuff | |
300 | |
301 (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
|
302 "Return non-nil if point is in a Python literal (a comment or string)." |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
303 ;; We don't need to save the match data. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
304 (nth 8 (syntax-ppss))) |
54789 | 305 |
306 (defconst python-space-backslash-table | |
307 (let ((table (copy-syntax-table python-mode-syntax-table))) | |
308 (modify-syntax-entry ?\\ " " table) | |
309 table) | |
310 "`python-mode-syntax-table' with backslash given whitespace syntax.") | |
311 | |
312 (defun python-skip-comments/blanks (&optional backward) | |
313 "Skip comments and blank lines. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
314 BACKWARD non-nil means go backwards, otherwise go forwards. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
315 Backslash is treated as whitespace so that continued blank lines |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
316 are skipped. Doesn't move out of comments -- should be outside |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
317 or at end of line." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
318 (let ((arg (if backward |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
319 ;; If we're in a comment (including on the trailing |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
320 ;; newline), forward-comment doesn't move backwards out |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
321 ;; of it. Don't set the syntax table round this bit! |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
322 (let ((syntax (syntax-ppss))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
323 (if (nth 4 syntax) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
324 (goto-char (nth 8 syntax))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
325 (- (point-max))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
326 (point-max)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
327 (with-syntax-table python-space-backslash-table |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
328 (forward-comment arg)))) |
54789 | 329 |
330 (defun python-backslash-continuation-line-p () | |
331 "Non-nil if preceding line ends with backslash that is not in a comment." | |
332 (and (eq ?\\ (char-before (line-end-position 0))) | |
333 (not (syntax-ppss-context (syntax-ppss))))) | |
334 | |
335 (defun python-continuation-line-p () | |
336 "Return non-nil if current line continues a previous one. | |
337 The criteria are that the previous line ends in a backslash outside | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
338 comments and strings, or that point is within brackets/parens." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
339 (or (python-backslash-continuation-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
340 (let ((depth (syntax-ppss-depth |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
341 (save-excursion ; syntax-ppss with arg changes point |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
342 (syntax-ppss (line-beginning-position)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
343 (or (> depth 0) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
344 (if (< depth 0) ; Unbalanced brackets -- act locally |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
345 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
346 (condition-case () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
347 (progn (backward-up-list) t) ; actually within brackets |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
348 (error nil)))))))) |
54789 | 349 |
350 (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
|
351 "Return non-nil iff current line has only a comment." |
54789 | 352 (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
|
353 (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
|
354 (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
|
355 (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
|
356 (looking-at (rx (or (syntax comment-start) line-end)))))) |
54789 | 357 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
358 (defun python-blank-line-p () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
359 "Return non-nil iff current line is blank." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
360 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
361 (beginning-of-line) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
362 (looking-at "\\s-*$"))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
363 |
54789 | 364 (defun python-beginning-of-string () |
365 "Go to beginning of string around point. | |
366 Do nothing if not in string." | |
367 (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
|
368 (when (eq 'string (syntax-ppss-context state)) |
54789 | 369 (goto-char (nth 8 state))))) |
370 | |
371 (defun python-open-block-statement-p (&optional bos) | |
372 "Return non-nil if statement at point opens a block. | |
373 BOS non-nil means point is known to be at beginning of statement." | |
374 (save-excursion | |
375 (unless bos (python-beginning-of-statement)) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
376 (looking-at (rx (and (or "if" "else" "elif" "while" "for" "def" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
377 "class" "try" "except" "finally") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
378 symbol-end))))) |
54789 | 379 |
380 (defun python-close-block-statement-p (&optional bos) | |
381 "Return non-nil if current line is a statement closing a block. | |
382 BOS non-nil means point is at beginning of statement. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
383 The criteria are that the line isn't a comment or in string and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
384 starts with keyword `raise', `break', `continue' or `pass'." |
54789 | 385 (save-excursion |
386 (unless bos (python-beginning-of-statement)) | |
387 (back-to-indentation) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
388 (looking-at (rx (or "return" "raise" "break" "continue" "pass") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
389 symbol-end)))) |
54789 | 390 |
391 (defun python-outdent-p () | |
392 "Return non-nil if current line should outdent a level." | |
393 (save-excursion | |
394 (back-to-indentation) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
395 (and (looking-at (rx (and (or "else" "finally" "except" "elif") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
396 symbol-end))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
397 (not (python-in-string/comment)) |
54789 | 398 ;; Ensure there's a previous statement and move to it. |
399 (zerop (python-previous-statement)) | |
400 (not (python-close-block-statement-p t)) | |
401 ;; Fixme: check this | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
402 (not (python-open-block-statement-p))))) |
54789 | 403 |
404 ;;;; Indentation. | |
405 | |
406 (defcustom python-indent 4 | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
407 "Number of columns for a unit of indentation in Python mode. |
54789 | 408 See also `\\[python-guess-indent]'" |
409 :group 'python | |
410 :type 'integer) | |
74386
1c8bca402ae7
(python-indent): Add safe-local-variable prop.
Richard M. Stallman <rms@gnu.org>
parents:
74001
diff
changeset
|
411 (put 'python-indent 'safe-local-variable 'integerp) |
54789 | 412 |
413 (defcustom python-guess-indent t | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
414 "Non-nil means Python mode guesses `python-indent' for the buffer." |
54789 | 415 :type 'boolean |
416 :group 'python) | |
417 | |
418 (defcustom python-indent-string-contents t | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
419 "Non-nil means indent contents of multi-line strings together. |
54789 | 420 This means indent them the same as the preceding non-blank line. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
421 Otherwise preserve their indentation. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
422 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
423 This only applies to `doc' strings, i.e. those that form statements; |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
424 the indentation is preserved in others." |
54789 | 425 :type '(choice (const :tag "Align with preceding" t) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
426 (const :tag "Preserve indentation" nil)) |
54789 | 427 :group 'python) |
428 | |
429 (defcustom python-honour-comment-indentation nil | |
430 "Non-nil means indent relative to preceding comment line. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
431 Only do this for comments where the leading comment character is |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
432 followed by space. This doesn't apply to comment lines, which |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
433 are always indented in lines with preceding comments." |
54789 | 434 :type 'boolean |
435 :group 'python) | |
436 | |
437 (defcustom python-continuation-offset 4 | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
438 "Number of columns of additional indentation for continuation lines. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
439 Continuation lines follow a backslash-terminated line starting a |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
440 statement." |
54789 | 441 :group 'python |
442 :type 'integer) | |
443 | |
444 (defun python-guess-indent () | |
445 "Guess step for indentation of current buffer. | |
446 Set `python-indent' locally to the value guessed." | |
447 (interactive) | |
448 (save-excursion | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
449 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
450 (widen) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
451 (goto-char (point-min)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
452 (let (done indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
453 (while (and (not done) (not (eobp))) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
454 (when (and (re-search-forward (rx ?: (0+ space) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
455 (or (syntax comment-start) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
456 line-end)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
457 nil 'move) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
458 (python-open-block-statement-p)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
459 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
460 (python-beginning-of-statement) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
461 (let ((initial (current-indentation))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
462 (if (zerop (python-next-statement)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
463 (setq indent (- (current-indentation) initial))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
464 (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
|
465 (setq done t)))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
466 (when done |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
467 (when (/= indent (default-value 'python-indent)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
468 (set (make-local-variable 'python-indent) indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
469 (unless (= tab-width python-indent) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
470 (setq indent-tabs-mode nil))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
471 indent))))) |
54789 | 472 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
473 ;; Alist of possible indentations and start of statement they would |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
474 ;; close. Used in indentation cycling (below). |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
475 (defvar python-indent-list nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
476 "Internal use.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
477 ;; Length of the above |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
478 (defvar python-indent-list-length nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
479 "Internal use.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
480 ;; Current index into the alist. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
481 (defvar python-indent-index nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
482 "Internal use.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
483 |
54789 | 484 (defun python-calculate-indentation () |
485 "Calculate Python indentation for line at point." | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
486 (setq python-indent-list nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
487 python-indent-list-length 1) |
54789 | 488 (save-excursion |
489 (beginning-of-line) | |
490 (let ((syntax (syntax-ppss)) | |
491 start) | |
492 (cond | |
493 ((eq 'string (syntax-ppss-context syntax)) ; multi-line string | |
494 (if (not python-indent-string-contents) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
495 (current-indentation) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
496 ;; Only respect `python-indent-string-contents' in doc |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
497 ;; strings (defined as those which form statements). |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
498 (if (not (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
499 (python-beginning-of-statement) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
500 (looking-at (rx (or (syntax string-delimiter) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
501 (syntax string-quote)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
502 (current-indentation) |
54789 | 503 ;; Find indentation of preceding non-blank line within string. |
504 (setq start (nth 8 syntax)) | |
505 (forward-line -1) | |
506 (while (and (< start (point)) (looking-at "\\s-*$")) | |
507 (forward-line -1)) | |
508 (current-indentation)))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
509 ((python-continuation-line-p) ; after backslash, or bracketed |
54789 | 510 (let ((point (point)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
511 (open-start (cadr syntax)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
512 (backslash (python-backslash-continuation-line-p)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
513 (colon (eq ?: (char-before (1- (line-beginning-position)))))) |
54789 | 514 (if open-start |
515 ;; Inside bracketed expression. | |
516 (progn | |
517 (goto-char (1+ open-start)) | |
518 ;; Look for first item in list (preceding point) and | |
519 ;; align with it, if found. | |
520 (if (with-syntax-table python-space-backslash-table | |
521 (let ((parse-sexp-ignore-comments t)) | |
522 (condition-case () | |
523 (progn (forward-sexp) | |
524 (backward-sexp) | |
525 (< (point) point)) | |
526 (error nil)))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
527 ;; Extra level if we're backslash-continued or |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
528 ;; following a key. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
529 (if (or backslash colon) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
530 (+ python-indent (current-column)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
531 (current-column)) |
54789 | 532 ;; Otherwise indent relative to statement start, one |
533 ;; level per bracketing level. | |
534 (goto-char (1+ open-start)) | |
535 (python-beginning-of-statement) | |
536 (+ (current-indentation) (* (car syntax) python-indent)))) | |
537 ;; Otherwise backslash-continued. | |
538 (forward-line -1) | |
539 (if (python-continuation-line-p) | |
540 ;; We're past first continuation line. Align with | |
541 ;; previous line. | |
542 (current-indentation) | |
543 ;; First continuation line. Indent one step, with an | |
544 ;; extra one if statement opens a block. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
545 (python-beginning-of-statement) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
546 (+ (current-indentation) python-continuation-offset |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
547 (if (python-open-block-statement-p t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
548 python-indent |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
549 0)))))) |
54789 | 550 ((bobp) 0) |
551 ;; Fixme: Like python-mode.el; not convinced by this. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
552 ((looking-at (rx (0+ space) (syntax comment-start) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
553 (not (any " \t\n")))) ; non-indentable comment |
54789 | 554 (current-indentation)) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
555 (t (if python-honour-comment-indentation |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
556 ;; Back over whitespace, newlines, non-indentable comments. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
557 (catch 'done |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
558 (while t |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
559 (if (cond ((bobp)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
560 ;; not at comment start |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
561 ((not (forward-comment -1)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
562 (python-beginning-of-statement) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
563 t) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
564 ;; trailing comment |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
565 ((/= (current-column) (current-indentation)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
566 (python-beginning-of-statement) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
567 t) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
568 ;; indentable comment like python-mode.el |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
569 ((and (looking-at (rx (syntax comment-start) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
570 (or space line-end))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
571 (/= 0 (current-column))))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
572 (throw 'done t))))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
573 (python-indentation-levels) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
574 ;; Prefer to indent comments with an immediately-following |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
575 ;; statement, e.g. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
576 ;; ... |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
577 ;; # ... |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
578 ;; def ... |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
579 (when (and (> python-indent-list-length 1) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
580 (python-comment-line-p)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
581 (forward-line) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
582 (unless (python-comment-line-p) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
583 (let ((elt (assq (current-indentation) python-indent-list))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
584 (setq python-indent-list |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
585 (nconc (delete elt python-indent-list) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
586 (list elt)))))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
587 (caar (last 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
|
588 |
54789 | 589 ;;;; Cycling through the possible indentations with successive TABs. |
590 | |
591 ;; These don't need to be buffer-local since they're only relevant | |
592 ;; during a cycle. | |
593 | |
594 (defun python-initial-text () | |
595 "Text of line following indentation and ignoring any trailing comment." | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
596 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
597 (buffer-substring (progn |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
598 (back-to-indentation) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
599 (point)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
600 (progn |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
601 (end-of-line) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
602 (forward-comment -1) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
603 (point))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
604 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
605 (defconst python-block-pairs |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
606 '(("else" "if" "elif" "while" "for" "try" "except") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
607 ("elif" "if" "elif") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
608 ("except" "try" "except") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
609 ("finally" "try")) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
610 "Alist of keyword matches. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
611 The car of an element is a keyword introducing a statement which |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
612 can close a block opened by a keyword in the cdr.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
613 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
614 (defun python-first-word () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
615 "Return first word (actually symbol) on the line." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
616 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
617 (back-to-indentation) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
618 (current-word t))) |
54789 | 619 |
620 (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
|
621 "Return a list of possible indentations for this line. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
622 It is assumed not to be a continuation line or in a multi-line string. |
54789 | 623 Includes the default indentation and those which would close all |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
624 enclosing blocks. Elements of the list are actually pairs: |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
625 \(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
|
626 corresponding block opening (or nil)." |
54789 | 627 (save-excursion |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
628 (let ((initial "") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
629 levels indent) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
630 ;; Only one possibility immediately following a block open |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
631 ;; statement, assuming it doesn't have a `suite' on the same line. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
632 (cond |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
633 ((save-excursion (and (python-previous-statement) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
634 (python-open-block-statement-p t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
635 (setq indent (current-indentation)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
636 ;; Check we don't have something like: |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
637 ;; if ...: ... |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
638 (if (progn (python-end-of-statement) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
639 (python-skip-comments/blanks t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
640 (eq ?: (char-before))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
641 (setq indent (+ python-indent indent))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
642 (push (cons indent initial) levels)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
643 ;; Only one possibility for comment line immediately following |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
644 ;; another. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
645 ((save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
646 (when (python-comment-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
647 (forward-line -1) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
648 (if (python-comment-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
649 (push (cons (current-indentation) initial) levels))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
650 ;; Fixme: Maybe have a case here which indents (only) first |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
651 ;; line after a lambda. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
652 (t |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
653 (let ((start (car (assoc (python-first-word) python-block-pairs)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
654 (python-previous-statement) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
655 ;; Is this a valid indentation for the line of interest? |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
656 (unless (or (if start ; potentially only outdentable |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
657 ;; Check for things like: |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
658 ;; if ...: ... |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
659 ;; else ...: |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
660 ;; where the second line need not be outdented. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
661 (not (member (python-first-word) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
662 (cdr (assoc start |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
663 python-block-pairs))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
664 ;; Not sensible to indent to the same level as |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
665 ;; previous `return' &c. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
666 (python-close-block-statement-p)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
667 (push (cons (current-indentation) (python-initial-text)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
668 levels)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
669 (while (python-beginning-of-block) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
670 (when (or (not start) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
671 (member (python-first-word) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
672 (cdr (assoc start python-block-pairs)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
673 (push (cons (current-indentation) (python-initial-text)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
674 levels)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
675 (prog1 (or levels (setq levels '((0 . "")))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
676 (setq python-indent-list levels |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
677 python-indent-list-length (length python-indent-list)))))) |
54789 | 678 |
679 ;; This is basically what `python-indent-line' would be if we didn't | |
680 ;; do the cycling. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
681 (defun python-indent-line-1 (&optional leave) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
682 "Subroutine of `python-indent-line'. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
683 Does non-repeated indentation. LEAVE non-nil means leave |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
684 indentation if it is valid, i.e. one of the positions returned by |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
685 `python-calculate-indentation'." |
54789 | 686 (let ((target (python-calculate-indentation)) |
687 (pos (- (point-max) (point)))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
688 (if (or (= target (current-indentation)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
689 ;; Maybe keep a valid indentation. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
690 (and leave python-indent-list |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
691 (assq (current-indentation) python-indent-list))) |
54789 | 692 (if (< (current-column) (current-indentation)) |
693 (back-to-indentation)) | |
694 (beginning-of-line) | |
695 (delete-horizontal-space) | |
696 (indent-to target) | |
697 (if (> (- (point-max) pos) (point)) | |
698 (goto-char (- (point-max) pos)))))) | |
699 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
700 (defun python-indent-line () |
54789 | 701 "Indent current line as Python code. |
702 When invoked via `indent-for-tab-command', cycle through possible | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
703 indentations for current line. The cycle is broken by a command |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
704 different from `indent-for-tab-command', i.e. successive TABs do |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
705 the cycling." |
54789 | 706 (interactive) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
707 (if (and (eq this-command 'indent-for-tab-command) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
708 (eq last-command this-command)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
709 (if (= 1 python-indent-list-length) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
710 (message "Sole indentation") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
711 (progn (setq python-indent-index |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
712 (% (1+ python-indent-index) python-indent-list-length)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
713 (beginning-of-line) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
714 (delete-horizontal-space) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
715 (indent-to (car (nth python-indent-index python-indent-list))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
716 (if (python-block-end-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
717 (let ((text (cdr (nth python-indent-index |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
718 python-indent-list)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
719 (if text |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
720 (message "Closes: %s" text)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
721 (python-indent-line-1) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
722 (setq python-indent-index (1- python-indent-list-length)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
723 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
724 (defun python-indent-region (start end) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
725 "`indent-region-function' for Python. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
726 Leaves validly-indented lines alone, i.e. doesn't indent to |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
727 another valid position." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
728 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
729 (goto-char end) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
730 (setq end (point-marker)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
731 (goto-char start) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
732 (or (bolp) (forward-line 1)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
733 (while (< (point) end) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
734 (or (and (bolp) (eolp)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
735 (python-indent-line-1 t)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
736 (forward-line 1)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
737 (move-marker end nil))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
738 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
739 (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
|
740 "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
|
741 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
|
742 (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
|
743 (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
|
744 (< (current-indentation) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
745 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
746 (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
|
747 (current-indentation)))))) |
54789 | 748 |
749 ;;;; Movement. | |
750 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
751 ;; Fixme: Define {for,back}ward-sexp-function? Maybe skip units like |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
752 ;; block, statement, depending on context. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
753 |
54789 | 754 (defun python-beginning-of-defun () |
755 "`beginning-of-defun-function' for Python. | |
756 Finds beginning of innermost nested class or method definition. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
757 Returns the name of the definition found at the end, or nil if |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
758 reached start of buffer." |
54789 | 759 (let ((ci (current-indentation)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
760 (def-re (rx line-start (0+ space) (or "def" "class") (1+ space) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
761 (group (1+ (or word (syntax symbol)))))) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
762 found lep) ;; def-line |
54789 | 763 (if (python-comment-line-p) |
764 (setq ci most-positive-fixnum)) | |
765 (while (and (not (bobp)) (not found)) | |
766 ;; Treat bol at beginning of function as outside function so | |
767 ;; that successive C-M-a makes progress backwards. | |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
768 ;;(setq def-line (looking-at def-re)) |
54789 | 769 (unless (bolp) (end-of-line)) |
770 (setq lep (line-end-position)) | |
771 (if (and (re-search-backward def-re nil 'move) | |
772 ;; Must be less indented or matching top level, or | |
773 ;; equally indented if we started on a definition line. | |
774 (let ((in (current-indentation))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
775 (or (and (zerop ci) (zerop in)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
776 (= lep (line-end-position)) ; on initial line |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
777 ;; Not sure why it was like this -- fails in case of |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
778 ;; last internal function followed by first |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
779 ;; non-def statement of the main body. |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
780 ;;(and def-line (= in ci)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
781 (= in ci) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
782 (< in ci))) |
54789 | 783 (not (python-in-string/comment))) |
784 (setq found t))))) | |
785 | |
786 (defun python-end-of-defun () | |
787 "`end-of-defun-function' for Python. | |
788 Finds end of innermost nested class or method definition." | |
789 (let ((orig (point)) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
790 (pattern (rx line-start (0+ space) (or "def" "class") space))) |
54789 | 791 ;; Go to start of current block and check whether it's at top |
792 ;; level. If it is, and not a block start, look forward for | |
793 ;; definition statement. | |
794 (when (python-comment-line-p) | |
795 (end-of-line) | |
796 (forward-comment most-positive-fixnum)) | |
797 (if (not (python-open-block-statement-p)) | |
798 (python-beginning-of-block)) | |
799 (if (zerop (current-indentation)) | |
800 (unless (python-open-block-statement-p) | |
801 (while (and (re-search-forward pattern nil 'move) | |
802 (python-in-string/comment))) ; just loop | |
803 (unless (eobp) | |
804 (beginning-of-line))) | |
805 ;; Don't move before top-level statement that would end defun. | |
806 (end-of-line) | |
807 (python-beginning-of-defun)) | |
808 ;; If we got to the start of buffer, look forward for | |
809 ;; definition statement. | |
810 (if (and (bobp) (not (looking-at "def\\|class"))) | |
811 (while (and (not (eobp)) | |
812 (re-search-forward pattern nil 'move) | |
813 (python-in-string/comment)))) ; just loop | |
814 ;; We're at a definition statement (or end-of-buffer). | |
815 (unless (eobp) | |
816 (python-end-of-block) | |
817 ;; Count trailing space in defun (but not trailing comments). | |
818 (skip-syntax-forward " >") | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
819 (unless (eobp) ; e.g. missing final newline |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
820 (beginning-of-line))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
821 ;; Catch pathological cases like this, where the beginning-of-defun |
54789 | 822 ;; skips to a definition we're not in: |
823 ;; if ...: | |
824 ;; ... | |
825 ;; else: | |
826 ;; ... # point here | |
827 ;; ... | |
828 ;; def ... | |
829 (if (< (point) orig) | |
830 (goto-char (point-max))))) | |
831 | |
832 (defun python-beginning-of-statement () | |
833 "Go to start of current statement. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
834 Accounts for continuation lines, multi-line strings, and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
835 multi-line bracketed expressions." |
54789 | 836 (beginning-of-line) |
837 (python-beginning-of-string) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
838 (while (python-continuation-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
839 (beginning-of-line) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
840 (if (python-backslash-continuation-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
841 (progn |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
842 (forward-line -1) |
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
|
843 (while (python-backslash-continuation-line-p) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
844 (forward-line -1))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
845 (python-beginning-of-string) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
846 (python-skip-out))) |
54789 | 847 (back-to-indentation)) |
848 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
849 (defun python-skip-out (&optional forward syntax) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
850 "Skip out of any nested brackets. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
851 Skip forward if FORWARD is non-nil, else backward. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
852 If SYNTAX is non-nil it is the state returned by `syntax-ppss' at point. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
853 Return non-nil iff skipping was done." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
854 (let ((depth (syntax-ppss-depth (or syntax (syntax-ppss)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
855 (forward (if forward -1 1))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
856 (unless (zerop depth) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
857 (if (> depth 0) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
858 ;; Skip forward out of nested brackets. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
859 (condition-case () ; beware invalid syntax |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
860 (progn (backward-up-list (* forward depth)) t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
861 (error nil)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
862 ;; Invalid syntax (too many closed brackets). |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
863 ;; Skip out of as many as possible. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
864 (let (done) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
865 (while (condition-case () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
866 (progn (backward-up-list forward) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
867 (setq done t)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
868 (error nil))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
869 done))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
870 |
54789 | 871 (defun python-end-of-statement () |
872 "Go to the end of the current statement and return point. | |
873 Usually this is the start of the next line, but if this is a | |
874 multi-line statement we need to skip over the continuation lines. | |
875 On a comment line, go to end of line." | |
876 (end-of-line) | |
877 (while (let (comment) | |
878 ;; Move past any enclosing strings and sexps, or stop if | |
879 ;; we're in a comment. | |
880 (while (let ((s (syntax-ppss))) | |
881 (cond ((eq 'comment (syntax-ppss-context s)) | |
882 (setq comment t) | |
883 nil) | |
884 ((eq 'string (syntax-ppss-context s)) | |
885 ;; Go to start of string and skip it. | |
886 (goto-char (nth 8 s)) | |
887 (condition-case () ; beware invalid syntax | |
888 (progn (forward-sexp) t) | |
889 (error (end-of-line)))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
890 ((python-skip-out t s)))) |
54789 | 891 (end-of-line)) |
892 (unless comment | |
893 (eq ?\\ (char-before)))) ; Line continued? | |
894 (end-of-line 2)) ; Try next line. | |
895 (point)) | |
896 | |
897 (defun python-previous-statement (&optional count) | |
898 "Go to start of previous statement. | |
899 With argument COUNT, do it COUNT times. Stop at beginning of buffer. | |
900 Return count of statements left to move." | |
901 (interactive "p") | |
902 (unless count (setq count 1)) | |
903 (if (< count 0) | |
904 (python-next-statement (- count)) | |
905 (python-beginning-of-statement) | |
906 (while (and (> count 0) (not (bobp))) | |
907 (python-skip-comments/blanks t) | |
908 (python-beginning-of-statement) | |
909 (unless (bobp) (setq count (1- count)))) | |
910 count)) | |
911 | |
912 (defun python-next-statement (&optional count) | |
913 "Go to start of next statement. | |
914 With argument COUNT, do it COUNT times. Stop at end of buffer. | |
915 Return count of statements left to move." | |
916 (interactive "p") | |
917 (unless count (setq count 1)) | |
918 (if (< count 0) | |
919 (python-previous-statement (- count)) | |
920 (beginning-of-line) | |
921 (while (and (> count 0) (not (eobp))) | |
922 (python-end-of-statement) | |
923 (python-skip-comments/blanks) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
924 (unless (eobp) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
925 (setq count (1- count)))) |
54789 | 926 count)) |
927 | |
928 (defun python-beginning-of-block (&optional arg) | |
929 "Go to start of current block. | |
930 With numeric arg, do it that many times. If ARG is negative, call | |
931 `python-end-of-block' instead. | |
932 If point is on the first line of a block, use its outer block. | |
933 If current statement is in column zero, don't move and return nil. | |
934 Otherwise return non-nil." | |
935 (interactive "p") | |
936 (unless arg (setq arg 1)) | |
937 (cond | |
938 ((zerop arg)) | |
939 ((< arg 0) (python-end-of-block (- arg))) | |
940 (t | |
941 (let ((point (point))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
942 (if (or (python-comment-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
943 (python-blank-line-p)) |
54789 | 944 (python-skip-comments/blanks t)) |
945 (python-beginning-of-statement) | |
946 (let ((ci (current-indentation))) | |
947 (if (zerop ci) | |
948 (not (goto-char point)) ; return nil | |
949 ;; Look upwards for less indented statement. | |
950 (if (catch 'done | |
951 ;;; This is slower than the below. | |
952 ;;; (while (zerop (python-previous-statement)) | |
953 ;;; (when (and (< (current-indentation) ci) | |
954 ;;; (python-open-block-statement-p t)) | |
955 ;;; (beginning-of-line) | |
956 ;;; (throw 'done t))) | |
957 (while (and (zerop (forward-line -1))) | |
958 (when (and (< (current-indentation) ci) | |
959 (not (python-comment-line-p)) | |
960 ;; Move to beginning to save effort in case | |
961 ;; this is in string. | |
962 (progn (python-beginning-of-statement) t) | |
963 (python-open-block-statement-p t)) | |
964 (beginning-of-line) | |
965 (throw 'done t))) | |
966 (not (goto-char point))) ; Failed -- return nil | |
967 (python-beginning-of-block (1- arg))))))))) | |
968 | |
969 (defun python-end-of-block (&optional arg) | |
970 "Go to end of current block. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
971 With numeric arg, do it that many times. If ARG is negative, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
972 call `python-beginning-of-block' instead. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
973 If current statement is in column zero and doesn't open a block, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
974 don't move and return nil. Otherwise return t." |
54789 | 975 (interactive "p") |
976 (unless arg (setq arg 1)) | |
977 (if (< arg 0) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
978 (python-beginning-of-block (- arg)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
979 (while (and (> arg 0) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
980 (let* ((point (point)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
981 (_ (if (python-comment-line-p) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
982 (python-skip-comments/blanks t))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
983 (ci (current-indentation)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
984 (open (python-open-block-statement-p))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
985 (if (and (zerop ci) (not open)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
986 (not (goto-char point)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
987 (catch 'done |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
988 (while (zerop (python-next-statement)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
989 (when (or (and open (<= (current-indentation) ci)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
990 (< (current-indentation) ci)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
991 (python-skip-comments/blanks t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
992 (beginning-of-line 2) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
993 (throw 'done t))))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
994 (setq arg (1- arg))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
995 (zerop arg))) |
54789 | 996 |
997 ;;;; Imenu. | |
998 | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
999 (defvar python-recursing) |
54789 | 1000 (defun python-imenu-create-index () |
1001 "`imenu-create-index-function' for Python. | |
1002 | |
1003 Makes nested Imenu menus from nested `class' and `def' statements. | |
1004 The nested menus are headed by an item referencing the outer | |
1005 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
|
1006 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
|
1007 precede it)." |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1008 (unless (boundp 'python-recursing) ; dynamically bound below |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1009 ;; Normal call from Imenu. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1010 (goto-char (point-min)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1011 ;; Without this, we can get an infloop if the buffer isn't all |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1012 ;; fontified. I guess this is really a bug in syntax.el. OTOH, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1013 ;; _with_ this, imenu doesn't immediately work; I can't figure out |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1014 ;; what's going on, but it must be something to do with timers in |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1015 ;; font-lock. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1016 ;; This can't be right, especially not when jit-lock is not used. --Stef |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1017 ;; (unless (get-text-property (1- (point-max)) 'fontified) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1018 ;; (font-lock-fontify-region (point-min) (point-max))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1019 ) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1020 (let (index-alist) ; accumulated value to return |
54789 | 1021 (while (re-search-forward |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1022 (rx line-start (0+ space) ; leading space |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1023 (or (group "def") (group "class")) ; type |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1024 (1+ space) (group (1+ (or word ?_)))) ; name |
54789 | 1025 nil t) |
1026 (unless (python-in-string/comment) | |
1027 (let ((pos (match-beginning 0)) | |
1028 (name (match-string-no-properties 3))) | |
1029 (if (match-beginning 2) ; def or class? | |
1030 (setq name (concat "class " name))) | |
1031 (save-restriction | |
1032 (narrow-to-defun) | |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
1033 (let* ((python-recursing t) |
54789 | 1034 (sublist (python-imenu-create-index))) |
1035 (if sublist | |
1036 (progn (push (cons (concat " " name) pos) sublist) | |
1037 (push (cons name sublist) index-alist)) | |
1038 (push (cons name pos) index-alist))))))) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1039 (unless (boundp 'python-recursing) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1040 ;; Look for module variables. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1041 (let (vars) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1042 (goto-char (point-min)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1043 (while (re-search-forward |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1044 (rx line-start (group (1+ (or word ?_))) (0+ space) "=") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1045 nil t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1046 (unless (python-in-string/comment) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1047 (push (cons (match-string 1) (match-beginning 1)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1048 vars))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1049 (setq index-alist (nreverse index-alist)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1050 (if vars |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1051 (push (cons "Module variables" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1052 (nreverse vars)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1053 index-alist)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1054 index-alist)) |
54789 | 1055 |
1056 ;;;; `Electric' commands. | |
1057 | |
1058 (defun python-electric-colon (arg) | |
1059 "Insert a colon and maybe outdent the line if it is a statement like `else'. | |
1060 With numeric ARG, just insert that many colons. With \\[universal-argument], | |
1061 just insert a single colon." | |
1062 (interactive "*P") | |
1063 (self-insert-command (if (not (integerp arg)) 1 arg)) | |
1064 (and (not arg) | |
1065 (eolp) | |
1066 (python-outdent-p) | |
1067 (not (python-in-string/comment)) | |
1068 (> (current-indentation) (python-calculate-indentation)) | |
1069 (python-indent-line))) ; OK, do it | |
1070 (put 'python-electric-colon 'delete-selection t) | |
1071 | |
1072 (defun python-backspace (arg) | |
1073 "Maybe delete a level of indentation on the current line. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1074 Do so if point is at the end of the line's indentation. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1075 Otherwise just call `backward-delete-char-untabify'. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1076 Repeat ARG times." |
54789 | 1077 (interactive "*p") |
1078 (if (or (/= (current-indentation) (current-column)) | |
1079 (bolp) | |
1080 (python-continuation-line-p)) | |
1081 (backward-delete-char-untabify arg) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1082 ;; Look for the largest valid indentation which is smaller than |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1083 ;; the current indentation. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1084 (let ((indent 0) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1085 (ci (current-indentation)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1086 (indents (python-indentation-levels)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1087 initial) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1088 (dolist (x indents) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1089 (if (< (car x) ci) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1090 (setq indent (max indent (car x))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1091 (setq initial (cdr (assq indent indents))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1092 (if (> (length initial) 0) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1093 (message "Closes %s" initial)) |
54789 | 1094 (delete-horizontal-space) |
1095 (indent-to indent)))) | |
1096 (put 'python-backspace 'delete-selection 'supersede) | |
1097 | |
1098 ;;;; pychecker | |
1099 | |
1100 (defcustom python-check-command "pychecker --stdlib" | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1101 "Command used to check a Python file." |
54789 | 1102 :type 'string |
1103 :group 'python) | |
1104 | |
1105 (defvar python-saved-check-command nil | |
1106 "Internal use.") | |
1107 | |
1108 ;; After `sgml-validate-command'. | |
1109 (defun python-check (command) | |
1110 "Check a Python file (default current buffer's file). | |
1111 Runs COMMAND, a shell command, as if by `compile'. | |
1112 See `python-check-command' for the default." | |
1113 (interactive | |
1114 (list (read-string "Checker command: " | |
1115 (or python-saved-check-command | |
1116 (concat python-check-command " " | |
1117 (let ((name (buffer-file-name))) | |
1118 (if name | |
1119 (file-name-nondirectory name)))))))) | |
1120 (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
|
1121 (require 'compile) ;To define compilation-* variables. |
54789 | 1122 (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
|
1123 (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
|
1124 (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
|
1125 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
|
1126 (compilation-start command))) |
54789 | 1127 |
1128 ;;;; Inferior mode stuff (following cmuscheme). | |
1129 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1130 ;; 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
|
1131 |
54789 | 1132 (defcustom python-python-command "python" |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1133 "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
|
1134 Any arguments can't contain whitespace. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1135 Note that IPython may not work properly; it must at least be used |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1136 with the `-cl' flag, i.e. use `ipython -cl'." |
54789 | 1137 :group 'python |
1138 :type 'string) | |
1139 | |
1140 (defcustom python-jython-command "jython" | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1141 "Shell command to run Jython interpreter. |
54789 | 1142 Any arguments can't contain whitespace." |
1143 :group 'python | |
1144 :type 'string) | |
1145 | |
1146 (defvar python-command python-python-command | |
1147 "Actual command used to run Python. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1148 May be `python-python-command' or `python-jython-command', possibly |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1149 modified by the user. Additional arguments are added when the command |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1150 is used by `run-python' et al.") |
54789 | 1151 |
1152 (defvar python-buffer nil | |
76570
6e293ce14a97
(python-default-template): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
76348
diff
changeset
|
1153 "*The current Python process buffer. |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1154 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1155 Commands that send text from source buffers to Python processes have |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1156 to choose a process to send to. This is determined by buffer-local |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1157 value of `python-buffer'. If its value in the current buffer, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1158 i.e. both any local value and the default one, is nil, `run-python' |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1159 and commands that send to the Python process will start a new process. |
54789 | 1160 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1161 Whenever \\[run-python] starts a new process, it resets the default |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1162 value of `python-buffer' to be the new process's buffer and sets the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1163 buffer-local value similarly if the current buffer is in Python mode |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1164 or Inferior Python mode, so that source buffer stays associated with a |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1165 specific sub-process. |
54789 | 1166 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1167 Use \\[python-set-proc] to set the default value from a buffer with a |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1168 local value.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1169 (make-variable-buffer-local 'python-buffer) |
54789 | 1170 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1171 (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
|
1172 ;; FIXME: maybe these should move to compilation-error-regexp-alist-alist. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1173 ;; The first already is (for CAML), but the second isn't. Anyhow, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1174 ;; these are specific to the inferior buffer. -- fx |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1175 `((,(rx line-start (1+ (any " \t")) "File \"" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1176 (group (1+ (not (any "\"<")))) ; avoid `<stdin>' &c |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1177 "\", 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
|
1178 1 2) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1179 (,(rx " in file " (group (1+ not-newline)) " on line " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1180 (group (1+ digit))) |
55300
2db456741f80
(python-compilation-line-number): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55240
diff
changeset
|
1181 1 2)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1182 "`compilation-error-regexp-alist' for inferior Python.") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1183 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1184 (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
|
1185 (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
|
1186 ;; 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
|
1187 (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
|
1188 (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
|
1189 ;; 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
|
1190 ;; 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
|
1191 ;; 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
|
1192 ;; 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
|
1193 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1194 ;; (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
|
1195 ;; (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
|
1196 map)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1197 |
74001
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1198 (defvar inferior-python-mode-syntax-table |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1199 (let ((st (make-syntax-table python-mode-syntax-table))) |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1200 ;; Don't get confused by apostrophes in the process's output (e.g. if |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1201 ;; you execute "help(os)"). |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1202 (modify-syntax-entry ?\' "." st) |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1203 ;; Maybe we should do the same for double quotes? |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1204 ;; (modify-syntax-entry ?\" "." st) |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1205 st)) |
871131fc9087
(inferior-python-mode-syntax-table): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73459
diff
changeset
|
1206 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1207 ;; Fixme: This should inherit some stuff from `python-mode', but I'm |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1208 ;; not sure how much: at least some keybindings, like C-c C-f; |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1209 ;; syntax?; font-locking, e.g. for triple-quoted strings? |
54789 | 1210 (define-derived-mode inferior-python-mode comint-mode "Inferior Python" |
1211 "Major mode for interacting with an inferior Python process. | |
1212 A Python process can be started with \\[run-python]. | |
1213 | |
1214 Hooks `comint-mode-hook' and `inferior-python-mode-hook' are run in | |
1215 that order. | |
1216 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1217 You can send text to the inferior Python process from other buffers |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1218 containing Python source. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1219 * \\[python-switch-to-python] switches the current buffer to the Python |
54789 | 1220 process buffer. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1221 * \\[python-send-region] sends the current region to the Python process. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1222 * \\[python-send-region-and-go] switches to the Python process buffer |
54789 | 1223 after sending the text. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1224 For running multiple processes in multiple buffers, see `run-python' and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1225 `python-buffer'. |
54789 | 1226 |
1227 \\{inferior-python-mode-map}" | |
1228 :group 'python | |
1229 (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
|
1230 (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
|
1231 (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
|
1232 nil t) |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1233 ;; 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
|
1234 ;; (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
|
1235 (set (make-local-variable 'comint-prompt-regexp) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1236 (rx line-start (1+ (and (repeat 3 (any ">.")) " ")))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1237 (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
|
1238 python-compilation-regexp-alist) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1239 (compilation-shell-minor-mode 1)) |
54789 | 1240 |
1241 (defcustom inferior-python-filter-regexp "\\`\\s-*\\S-?\\S-?\\s-*\\'" | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1242 "Input matching this regexp is not saved on the history list. |
54789 | 1243 Default ignores all inputs of 0, 1, or 2 non-blank characters." |
1244 :type 'regexp | |
1245 :group 'python) | |
1246 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1247 (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
|
1248 "`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
|
1249 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
|
1250 (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
|
1251 |
54789 | 1252 ;; Fixme: Loses with quoted whitespace. |
1253 (defun python-args-to-list (string) | |
1254 (let ((where (string-match "[ \t]" string))) | |
1255 (cond ((null where) (list string)) | |
1256 ((not (= where 0)) | |
1257 (cons (substring string 0 where) | |
1258 (python-args-to-list (substring string (+ 1 where))))) | |
1259 (t (let ((pos (string-match "[^ \t]" string))) | |
1260 (if pos (python-args-to-list (substring string pos)))))))) | |
1261 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1262 (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
|
1263 "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
|
1264 |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1265 (defvar python-preoutput-leftover nil) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1266 (defvar python-preoutput-skip-next-prompt nil) |
61037
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1267 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1268 ;; 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
|
1269 ;; >>> ... ... >>> |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1270 (defun python-preoutput-filter (s) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1271 "`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
|
1272 (when python-preoutput-leftover |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1273 (setq s (concat python-preoutput-leftover s)) |
758ff54158e2
(python-preoutput-leftover): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60931
diff
changeset
|
1274 (setq python-preoutput-leftover nil)) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1275 (let ((start 0) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1276 (res "")) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1277 ;; First process whole lines. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1278 (while (string-match "\n" s start) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1279 (let ((line (substring s start (setq start (match-end 0))))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1280 ;; Skip prompt if needed. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1281 (when (and python-preoutput-skip-next-prompt |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1282 (string-match comint-prompt-regexp line)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1283 (setq python-preoutput-skip-next-prompt nil) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1284 (setq line (substring line (match-end 0)))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1285 ;; Recognize special _emacs_out lines. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1286 (if (and (string-match "\\`_emacs_out \\(.*\\)\n\\'" line) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1287 (local-variable-p 'python-preoutput-result)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1288 (progn |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1289 (setq python-preoutput-result (match-string 1 line)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1290 (set (make-local-variable 'python-preoutput-skip-next-prompt) t)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1291 (setq res (concat res line))))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1292 ;; Then process the remaining partial line. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1293 (unless (zerop start) (setq s (substring s start))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1294 (cond ((and (string-match comint-prompt-regexp s) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1295 ;; Drop this prompt if it follows an _emacs_out... |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1296 (or python-preoutput-skip-next-prompt |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1297 ;; ... or if it's not gonna be inserted at BOL. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1298 ;; Maybe we could be more selective here. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1299 (if (zerop (length res)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1300 (not (bolp)) |
72936
063a265bc04f
(python-preoutput-filter): Fix arg order to string-match.
Richard M. Stallman <rms@gnu.org>
parents:
72762
diff
changeset
|
1301 (string-match ".\\'" res)))) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1302 ;; The need for this seems to be system-dependent: |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1303 ;; What is this all about, exactly? --Stef |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1304 ;; (if (and (eq ?. (aref s 0))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1305 ;; (accept-process-output (get-buffer-process (current-buffer)) 1)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1306 (setq python-preoutput-skip-next-prompt nil) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1307 res) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1308 ((let ((end (min (length "_emacs_out ") (length s)))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1309 (eq t (compare-strings s nil end "_emacs_out " nil end))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1310 ;; The leftover string is a prefix of _emacs_out so we don't know |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1311 ;; yet whether it's an _emacs_out or something else: wait until we |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1312 ;; get more output so we can resolve this ambiguity. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1313 (set (make-local-variable 'python-preoutput-leftover) s) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1314 res) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1315 (t (concat res s))))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1316 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1317 (autoload 'comint-check-proc "comint") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1318 |
54789 | 1319 ;;;###autoload |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1320 (defun run-python (&optional cmd noshow new) |
54789 | 1321 "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
|
1322 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
|
1323 buffer automatically. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1324 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1325 Normally, if there is a process already running in `python-buffer', |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1326 switch to that buffer. Interactively, a prefix arg allows you to edit |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1327 the initial command line (default is `python-command'); `-i' etc. args |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1328 will be added to this as appropriate. A new process is started if: |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1329 one isn't running attached to `python-buffer', or interactively the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1330 default `python-command', or argument NEW is non-nil. See also the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1331 documentation for `python-buffer'. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1332 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1333 Runs the hook `inferior-python-mode-hook' \(after the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1334 `comint-mode-hook' is run). \(Type \\[describe-mode] in the process |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1335 buffer for a list of commands.)" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1336 (interactive (if current-prefix-arg |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1337 (list (read-string "Run Python: " python-command) nil t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1338 (list python-command))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1339 (unless cmd (setq cmd python-python-command)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1340 (setq python-command cmd) |
54789 | 1341 ;; Fixme: Consider making `python-buffer' buffer-local as a buffer |
1342 ;; (not a name) in Python buffers from which `run-python' &c is | |
1343 ;; invoked. Would support multiple processes better. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1344 (when (or new (not (comint-check-proc python-buffer))) |
72567
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1345 (with-current-buffer |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1346 (let* ((cmdlist (append (python-args-to-list cmd) '("-i"))) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1347 (path (getenv "PYTHONPATH")) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1348 (process-environment ; to import emacs.py |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1349 (cons (concat "PYTHONPATH=" data-directory |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1350 (if path (concat ":" path))) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1351 process-environment))) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1352 (apply 'make-comint-in-buffer "Python" |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1353 (if new (generate-new-buffer "*Python*") "*Python*") |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1354 (car cmdlist) nil (cdr cmdlist))) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1355 (setq-default python-buffer (current-buffer)) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1356 (setq python-buffer (current-buffer)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1357 (accept-process-output (get-buffer-process python-buffer) 5) |
72567
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1358 (inferior-python-mode) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1359 ;; Load function definitions we need. |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1360 ;; Before the preoutput function was used, this was done via -c in |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1361 ;; cmdlist, but that loses the banner and doesn't run the startup |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1362 ;; file. The code might be inline here, but there's enough that it |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1363 ;; seems worth putting in a separate file, and it's probably cleaner |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1364 ;; to put it in a module. |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1365 ;; Ensure we're at a prompt before doing anything else. |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1366 (python-send-receive "import emacs; print '_emacs_out ()'"))) |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1367 (if (derived-mode-p 'python-mode) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1368 (setq python-buffer (default-value 'python-buffer))) ; buffer-local |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1369 ;; Without this, help output goes into the inferior python buffer if |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1370 ;; the process isn't already running. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1371 (sit-for 1 t) ;Should we use accept-process-output instead? --Stef |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1372 (unless noshow (pop-to-buffer python-buffer t))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1373 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1374 ;; 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
|
1375 ;; e.g. prompt is `help> '. Probably raise an error if the form of |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1376 ;; the prompt is unexpected. Actually, it needs to be `>>> ', not |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1377 ;; `... ', i.e. we're not inputting a block &c. However, this may not |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1378 ;; be the place to check it, e.g. we might actually want to send |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1379 ;; commands having set up such a state. |
54789 | 1380 |
55240
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1381 (defun python-send-command (command) |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1382 "Like `python-send-string' but resets `compilation-shell-minor-mode'. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1383 COMMAND should be a single statement." |
72567
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1384 ;; (assert (not (string-match "\n" command))) |
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1385 ;; (let ((end (marker-position (process-mark (python-proc))))) |
76348
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1386 (with-current-buffer (process-buffer (python-proc)) |
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1387 (goto-char (point-max)) |
55240
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1388 (compilation-forget-errors) |
72566
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1389 (python-send-string command) |
76348
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1390 (setq compilation-last-buffer (current-buffer))) |
72566
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1391 ;; No idea what this is for but it breaks the call to |
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1392 ;; compilation-fake-loc in python-send-region. -- Stef |
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1393 ;; Must wait until this has completed before re-setting variables below. |
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1394 ;; (python-send-receive "print '_emacs_out ()'") |
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1395 ;; (with-current-buffer python-buffer |
41f22ed02e75
(python-send-command): Don't wait for the command
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72535
diff
changeset
|
1396 ;; (set-marker compilation-parsing-end end)) |
72567
b562a18db094
(python-send-command): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72566
diff
changeset
|
1397 ) ;;) |
55240
780b94f913fe
(python-send-command): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55054
diff
changeset
|
1398 |
54789 | 1399 (defun python-send-region (start end) |
1400 "Send the region to the inferior Python process." | |
1401 ;; The region is evaluated from a temporary file. This avoids | |
1402 ;; problems with blank lines, which have different semantics | |
1403 ;; 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
|
1404 ;; 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
|
1405 ;; 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
|
1406 ;; (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
|
1407 ;; 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
|
1408 ;; tracebacks not to mention the frame of the function itself. |
54789 | 1409 ;; |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1410 ;; The `compilation-shell-minor-mode' parsing takes care of relating |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1411 ;; the reference to the temporary file to the source. |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1412 ;; |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1413 ;; 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
|
1414 ;; non-ASCII. |
54789 | 1415 (interactive "r") |
1416 (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
|
1417 (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
|
1418 (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
|
1419 (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
|
1420 (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
|
1421 (/= 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
|
1422 (save-excursion |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1423 (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
|
1424 ;; 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
|
1425 (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
|
1426 (write-region "if True:\n" nil f nil 'nomsg)) |
54789 | 1427 (write-region start end f t 'nomsg) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1428 (python-send-command command) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1429 (with-current-buffer (process-buffer (python-proc)) |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1430 ;; 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
|
1431 ;; positions past marker `orig-start'. It has to be done *after* |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1432 ;; `python-send-command''s call to `compilation-forget-errors'. |
58415
86ead4686506
(run-python): Don't hard code *Python*. Don't modify process-environment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58358
diff
changeset
|
1433 (compilation-fake-loc orig-start f)))) |
54789 | 1434 |
1435 (defun python-send-string (string) | |
1436 "Evaluate STRING in inferior Python process." | |
1437 (interactive "sPython command: ") | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1438 (comint-send-string (python-proc) string) |
72761
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1439 (unless (string-match "\n\\'" string) |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1440 ;; Make sure the text is properly LF-terminated. |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1441 (comint-send-string (python-proc) "\n")) |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1442 (when (string-match "\n[ \t].*\n?\\'" string) |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1443 ;; If the string contains a final indented line, add a second newline so |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1444 ;; as to make sure we terminate the multiline instruction. |
a15622a85c05
Quieten the compiler about hippie-expand vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72578
diff
changeset
|
1445 (comint-send-string (python-proc) "\n"))) |
54789 | 1446 |
1447 (defun python-send-buffer () | |
1448 "Send the current buffer to the inferior Python process." | |
1449 (interactive) | |
1450 (python-send-region (point-min) (point-max))) | |
1451 | |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1452 ;; 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
|
1453 ;; module, not just at top level. |
54789 | 1454 (defun python-send-defun () |
1455 "Send the current defun (class or method) to the inferior Python process." | |
1456 (interactive) | |
1457 (save-excursion (python-send-region (progn (beginning-of-defun) (point)) | |
1458 (progn (end-of-defun) (point))))) | |
1459 | |
1460 (defun python-switch-to-python (eob-p) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1461 "Switch to the Python process buffer, maybe starting new process. |
54789 | 1462 With prefix arg, position cursor at end of buffer." |
1463 (interactive "P") | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1464 (pop-to-buffer (process-buffer (python-proc)) t) ;Runs python if needed. |
54789 | 1465 (when eob-p |
1466 (push-mark) | |
1467 (goto-char (point-max)))) | |
1468 | |
1469 (defun python-send-region-and-go (start end) | |
1470 "Send the region to the inferior Python process. | |
1471 Then switch to the process buffer." | |
1472 (interactive "r") | |
1473 (python-send-region start end) | |
1474 (python-switch-to-python t)) | |
1475 | |
1476 (defcustom python-source-modes '(python-mode jython-mode) | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1477 "Used to determine if a buffer contains Python source code. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1478 If a file is loaded into a buffer that is in one of these major modes, |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1479 it is considered Python source by `python-load-file', which uses the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1480 value to determine defaults." |
54789 | 1481 :type '(repeat function) |
1482 :group 'python) | |
1483 | |
1484 (defvar python-prev-dir/file nil | |
1485 "Caches (directory . file) pair used in the last `python-load-file' command. | |
1486 Used for determining the default in the next one.") | |
1487 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1488 (autoload 'comint-get-source "comint") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1489 |
54789 | 1490 (defun python-load-file (file-name) |
1491 "Load a Python file FILE-NAME into the inferior Python process. | |
1492 If the file has extension `.py' import or reload it as a module. | |
1493 Treating it as a module keeps the global namespace clean, provides | |
1494 function location information for debugging, and supports users of | |
1495 module-qualified names." | |
1496 (interactive (comint-get-source "Load Python file: " python-prev-dir/file | |
1497 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
|
1498 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
|
1499 (comint-check-source file-name) ; Check to see if buffer needs saving. |
54789 | 1500 (setq python-prev-dir/file (cons (file-name-directory file-name) |
1501 (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
|
1502 (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
|
1503 ;; 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
|
1504 (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
|
1505 (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
|
1506 (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
|
1507 (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
|
1508 (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
|
1509 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
|
1510 (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
|
1511 (message "%s loaded" file-name))) |
54789 | 1512 |
1513 (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
|
1514 "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
|
1515 See variable `python-buffer'. Starts a new process if necessary." |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1516 ;; Fixme: Maybe should look for another active process if there |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1517 ;; isn't one for `python-buffer'. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1518 (unless (comint-check-proc python-buffer) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1519 (run-python nil t)) |
76348
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1520 (get-buffer-process (if (derived-mode-p 'inferior-python-mode) |
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1521 (current-buffer) |
05d93f5e8286
(python-send-command): Restart proc if necessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
76255
diff
changeset
|
1522 python-buffer))) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1523 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1524 (defun python-set-proc () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1525 "Set the default value of `python-buffer' to correspond to this buffer. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1526 If the current buffer has a local value of `python-buffer', set the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1527 default (global) value to that. The associated Python process is |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1528 the one that gets input from \\[python-send-region] et al when used |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1529 in a buffer that doesn't have a local value of `python-buffer'." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1530 (interactive) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1531 (if (local-variable-p 'python-buffer) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1532 (setq-default python-buffer python-buffer) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1533 (error "No local value of `python-buffer'"))) |
54789 | 1534 |
1535 ;;;; Context-sensitive help. | |
1536 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1537 (defconst python-dotty-syntax-table |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1538 (let ((table (make-syntax-table))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1539 (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
|
1540 (modify-syntax-entry ?. "_" table) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1541 table) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1542 "Syntax table giving `.' symbol syntax. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1543 Otherwise inherits from `python-mode-syntax-table'.") |
54789 | 1544 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1545 (defvar view-return-to-alist) |
55511
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1546 (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
|
1547 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1548 (defvar python-imports) ; forward declaration |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1549 |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1550 ;; Fixme: Should this actually be used instead of info-look, i.e. be |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1551 ;; bound to C-h S? [Probably not, since info-look may work in cases |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1552 ;; where this doesn't.] |
54789 | 1553 (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
|
1554 "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
|
1555 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
|
1556 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1557 Symbol may be anything recognized by the interpreter's `help' |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1558 command -- e.g. `CALLS' -- not just variables in scope in the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1559 interpreter. This only works for Python version 2.2 or newer |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1560 since earlier interpreters don't support `help'. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1561 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1562 In some cases where this doesn't find documentation, \\[info-lookup-symbol] |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1563 will." |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1564 ;; 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
|
1565 ;; ensure the environment is appropriate. |
54789 | 1566 (interactive |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1567 (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
|
1568 (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
|
1569 (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
|
1570 (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
|
1571 (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
|
1572 "Describe symbol: ") |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1573 nil nil symbol)))) |
54789 | 1574 (if (equal symbol "") (error "No symbol")) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1575 ;; Ensure we have a suitable help buffer. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1576 ;; Fixme: Maybe process `Related help topics' a la help xrefs and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1577 ;; allow C-c C-f in help buffer. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1578 (let ((temp-buffer-show-hook ; avoid xref stuff |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1579 (lambda () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1580 (toggle-read-only 1) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1581 (setq view-return-to-alist |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1582 (list (cons (selected-window) help-return-method)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1583 (with-output-to-temp-buffer (help-buffer) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1584 (with-current-buffer standard-output |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1585 ;; Fixme: Is this actually useful? |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1586 (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1587 (set (make-local-variable 'comint-redirect-subvert-readonly) t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1588 (print-help-return-message)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1589 (comint-redirect-send-command-to-process (format "emacs.ehelp(%S, %s)" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1590 symbol python-imports) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1591 "*Help*" (python-proc) nil nil)) |
54789 | 1592 |
1593 (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
|
1594 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1595 (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
|
1596 "Send STRING to inferior Python (if any) and return result. |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
1597 The result is what follows `_emacs_out' in the output." |
72535
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1598 (python-send-string string) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1599 (let ((proc (python-proc))) |
72535
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1600 (with-current-buffer (process-buffer proc) |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1601 (set (make-local-variable 'python-preoutput-result) nil) |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1602 (while (progn |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1603 (accept-process-output proc 5) |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1604 (null python-preoutput-result))) |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1605 (prog1 python-preoutput-result |
e7ed98d0f919
(python-send-receive): Wait in the process's buffer so as to check the right
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72527
diff
changeset
|
1606 (kill-local-variable 'python-preoutput-result))))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1607 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1608 ;; Fixme: Is there anything reasonable we can do with random methods? |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1609 ;; (Currently only works with functions.) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1610 (defun python-eldoc-function () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1611 "`eldoc-print-current-symbol-info' for Python. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1612 Only works when point is in a function name, not its arg list, for |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1613 instance. Assumes an inferior Python is running." |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1614 (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
|
1615 (current-word)))) |
72578
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1616 ;; This is run from timers, so inhibit-quit tends to be set. |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1617 (with-local-quit |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1618 ;; First try the symbol we're on. |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1619 (or (and symbol |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1620 (python-send-receive (format "emacs.eargs(%S, %s)" |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1621 symbol python-imports))) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1622 ;; Try moving to symbol before enclosing parens. |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1623 (let ((s (syntax-ppss))) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1624 (unless (zerop (car s)) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1625 (when (eq ?\( (char-after (nth 1 s))) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1626 (save-excursion |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1627 (goto-char (nth 1 s)) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1628 (skip-syntax-backward "-") |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1629 (let ((point (point))) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1630 (skip-chars-backward "a-zA-Z._") |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1631 (if (< (point) point) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1632 (python-send-receive |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1633 (format "emacs.eargs(%S, %s)" |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1634 (buffer-substring-no-properties (point) point) |
a9874901ba07
(python-eldoc-function): Re-enable quit while waiting for process.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72567
diff
changeset
|
1635 python-imports)))))))))))) |
54789 | 1636 |
1637 ;;;; Info-look functionality. | |
1638 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1639 (defun python-after-info-look () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1640 "Set up info-look for Python. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1641 Used with `eval-after-load'." |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1642 (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
|
1643 " -V")))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1644 (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
|
1645 (match-string 1 s))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1646 ;; 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
|
1647 (versioned |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1648 (with-temp-buffer |
54938
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1649 (with-no-warnings (Info-mode)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1650 (condition-case () |
54888
89ed55db7532
(python-orig-start-line, python-orig-file): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54886
diff
changeset
|
1651 ;; 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
|
1652 (with-no-warnings |
109b2bf180dd
(python-after-info-look): Use with-no-warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54888
diff
changeset
|
1653 (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
|
1654 version)) |
5dbde1bf6cad
(help-buffer): Autoload when compiling.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55495
diff
changeset
|
1655 t) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1656 (error nil))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1657 (info-lookup-maybe-add-help |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1658 :mode 'python-mode |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1659 :regexp "[[:alnum:]_]+" |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1660 :doc-spec |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1661 ;; 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
|
1662 ;; 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
|
1663 ;; (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
|
1664 ;; instance.) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1665 (if versioned |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1666 ;; 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
|
1667 `((,(concat "(python" version "-ref)Miscellaneous Index") nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1668 (,(concat "(python" version "-ref)Module Index" nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1669 (,(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
|
1670 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1671 (,(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
|
1672 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1673 (,(concat "(python" version "-lib)Module Index" nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1674 (,(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
|
1675 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1676 (,(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
|
1677 nil "")) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1678 (,(concat "(python" version "-lib)Miscellaneous Index" nil ""))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1679 '(("(python-ref)Miscellaneous Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1680 ("(python-ref)Module Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1681 ("(python-ref)Function-Method-Variable Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1682 ("(python-ref)Class-Exception-Object Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1683 ("(python-lib)Module Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1684 ("(python-lib)Class-Exception-Object Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1685 ("(python-lib)Function-Method-Variable Index" nil "") |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1686 ("(python-lib)Miscellaneous Index" nil "")))))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1687 (eval-after-load "info-look" '(python-after-info-look)) |
54789 | 1688 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1689 ;;;; Miscellany. |
54789 | 1690 |
1691 (defcustom python-jython-packages '("java" "javax" "org" "com") | |
1692 "Packages implying `jython-mode'. | |
1693 If these are imported near the beginning of the buffer, `python-mode' | |
1694 actually punts to `jython-mode'." | |
1695 :type '(repeat string) | |
1696 :group 'python) | |
1697 | |
1698 ;; Called from `python-mode', this causes a recursive call of the | |
1699 ;; mode. See logic there to break out of the recursion. | |
1700 (defun python-maybe-jython () | |
1701 "Invoke `jython-mode' if the buffer appears to contain Jython code. | |
1702 The criterion is either a match for `jython-mode' via | |
1703 `interpreter-mode-alist' or an import of a module from the list | |
1704 `python-jython-packages'." | |
1705 ;; The logic is taken from python-mode.el. | |
1706 (save-excursion | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1707 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1708 (widen) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1709 (goto-char (point-min)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1710 (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
|
1711 (match-string 2)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1712 (if (and interpreter (eq 'jython-mode |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1713 (cdr (assoc (file-name-nondirectory |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1714 interpreter) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1715 interpreter-mode-alist)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1716 (jython-mode) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1717 (if (catch 'done |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1718 (while (re-search-forward |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1719 (rx line-start (or "import" "from") (1+ space) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1720 (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
|
1721 (+ (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
|
1722 t) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1723 (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
|
1724 (throw 'done t)))) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1725 (jython-mode))))))) |
54789 | 1726 |
1727 (defun python-fill-paragraph (&optional justify) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1728 "`fill-paragraph-function' handling comments and multi-line strings. |
54789 | 1729 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
|
1730 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
|
1731 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
|
1732 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
|
1733 Otherwise, do nothing." |
54789 | 1734 (interactive "P") |
1735 (or (fill-comment-paragraph justify) | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1736 ;; The `paragraph-start' and `paragraph-separate' variables |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1737 ;; 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
|
1738 ;; 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
|
1739 ;; (the end of) the current line. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1740 (save-excursion |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1741 (end-of-line) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1742 (let* ((syntax (syntax-ppss)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1743 (orig (point)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1744 (start (nth 8 syntax)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1745 end) |
76255
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1746 (cond ((eq t (nth 3 syntax)) ; in fenced string |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1747 (goto-char (nth 8 syntax)) ; string start |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1748 (setq end (condition-case () ; for unbalanced quotes |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1749 (progn (forward-sexp) (point)) |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1750 (error (point-max))))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1751 ((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
|
1752 ; string |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1753 (forward-char) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1754 (setq end (point)) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1755 (condition-case () |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1756 (progn (backward-sexp) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1757 (setq start (point))) |
76255
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1758 (error (setq end nil))))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1759 (when end |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1760 (save-restriction |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1761 (narrow-to-region start end) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1762 (goto-char orig) |
76255
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1763 (let ((paragraph-separate |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1764 ;; Make sure that fenced-string delimiters that stand |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1765 ;; on their own line stay there. |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1766 (concat "[ \t]*['\"]+[ \t]*$\\|" paragraph-separate))) |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1767 (fill-paragraph justify)))))) |
985cc73beb79
(python-quote-syntax): Don't bother with syntax-ppss-context.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
1768 t)) |
54789 | 1769 |
1770 (defun python-shift-left (start end &optional count) | |
1771 "Shift lines in region COUNT (the prefix arg) columns to the left. | |
1772 COUNT defaults to `python-indent'. If region isn't active, just shift | |
1773 current line. The region shifted includes the lines in which START and | |
1774 END lie. It is an error if any lines in the region are indented less than | |
1775 COUNT columns." | |
1776 (interactive (if mark-active | |
1777 (list (region-beginning) (region-end) current-prefix-arg) | |
1778 (list (point) (point) current-prefix-arg))) | |
1779 (if count | |
1780 (setq count (prefix-numeric-value count)) | |
1781 (setq count python-indent)) | |
1782 (when (> count 0) | |
1783 (save-excursion | |
1784 (goto-char start) | |
1785 (while (< (point) end) | |
1786 (if (and (< (current-indentation) count) | |
1787 (not (looking-at "[ \t]*$"))) | |
1788 (error "Can't shift all lines enough")) | |
1789 (forward-line)) | |
1790 (indent-rigidly start end (- count))))) | |
1791 | |
1792 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") | |
1793 | |
1794 (defun python-shift-right (start end &optional count) | |
1795 "Shift lines in region COUNT (the prefix arg) columns to the right. | |
1796 COUNT defaults to `python-indent'. If region isn't active, just shift | |
1797 current line. The region shifted includes the lines in which START and | |
1798 END lie." | |
1799 (interactive (if mark-active | |
1800 (list (region-beginning) (region-end) current-prefix-arg) | |
1801 (list (point) (point) current-prefix-arg))) | |
1802 (if count | |
1803 (setq count (prefix-numeric-value count)) | |
1804 (setq count python-indent)) | |
1805 (indent-rigidly start end count)) | |
1806 | |
1807 (defun python-outline-level () | |
1808 "`outline-level' function for Python mode. | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
1809 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
|
1810 of current line." |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1811 (1+ (/ (current-indentation) python-indent))) |
54789 | 1812 |
1813 ;; Fixme: Consider top-level assignments, imports, &c. | |
1814 (defun python-current-defun () | |
1815 "`add-log-current-defun-function' for Python." | |
1816 (save-excursion | |
1817 ;; Move up the tree of nested `class' and `def' blocks until we | |
1818 ;; get to zero indentation, accumulating the defined names. | |
1819 (let ((start t) | |
1820 accum) | |
1821 (while (or start (> (current-indentation) 0)) | |
1822 (setq start nil) | |
1823 (python-beginning-of-block) | |
1824 (end-of-line) | |
1825 (beginning-of-defun) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1826 (if (looking-at (rx (0+ space) (or "def" "class") (1+ space) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1827 (group (1+ (or word (syntax symbol)))))) |
54789 | 1828 (push (match-string 1) accum))) |
1829 (if accum (mapconcat 'identity accum "."))))) | |
1830 | |
1831 (defun python-mark-block () | |
1832 "Mark the block around point. | |
1833 Uses `python-beginning-of-block', `python-end-of-block'." | |
1834 (interactive) | |
1835 (push-mark) | |
1836 (python-beginning-of-block) | |
1837 (push-mark (point) nil t) | |
1838 (python-end-of-block) | |
1839 (exchange-point-and-mark)) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1840 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1841 ;; Fixme: Provide a find-function-like command to find source of a |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1842 ;; definition (separate from BicycleRepairMan). Complicated by |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1843 ;; finding the right qualified name. |
54789 | 1844 |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1845 ;;;; Completion. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1846 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1847 (defvar python-imports nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1848 "String of top-level import statements updated by `python-find-imports'.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1849 (make-variable-buffer-local 'python-imports) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1850 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1851 ;; Fixme: Should font-lock try to run this when it deals with an import? |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1852 ;; Maybe not a good idea if it gets run multiple times when the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1853 ;; statement is being edited, and is more likely to end up with |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1854 ;; something syntactically incorrect. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1855 ;; However, what we should do is to trundle up the block tree from point |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1856 ;; to extract imports that appear to be in scope, and add those. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1857 (defun python-find-imports () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1858 "Find top-level imports, updating `python-imports'." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1859 (interactive) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1860 (save-excursion |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1861 (let (lines) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1862 (goto-char (point-min)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1863 (while (re-search-forward "^import\\>\\|^from\\>" nil t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1864 (unless (syntax-ppss-context (syntax-ppss)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1865 (push (buffer-substring (line-beginning-position) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1866 (line-beginning-position 2)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1867 lines))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1868 (setq python-imports |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1869 (if lines |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1870 (apply #'concat |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1871 ;; This is probably best left out since you're unlikely to need the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1872 ;; doc for a function in the buffer and the import will lose if the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1873 ;; Python sub-process' working directory isn't the same as the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1874 ;; buffer's. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1875 ;; (if buffer-file-name |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1876 ;; (concat |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1877 ;; "import " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1878 ;; (file-name-sans-extension |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1879 ;; (file-name-nondirectory buffer-file-name)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1880 (nreverse lines)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1881 "None")) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1882 (when lines |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1883 (set-text-properties 0 (length python-imports) nil python-imports) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1884 ;; The output ends up in the wrong place if the string we |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1885 ;; send contains newlines (from the imports). |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1886 (setq python-imports |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1887 (replace-regexp-in-string "\n" "\\n" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1888 (format "%S" python-imports) t t)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1889 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1890 ;; Fixme: This fails the first time if the sub-process isn't already |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1891 ;; running. Presumably a timing issue with i/o to the process. |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1892 (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
|
1893 "Return a list of completions of the string SYMBOL from Python process. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1894 The list is sorted. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1895 Uses `python-imports' to load modules against which to complete." |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1896 (when symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1897 (let ((completions |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1898 (condition-case () |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1899 (car (read-from-string |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1900 (python-send-receive |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1901 (format "emacs.complete(%S,%s)" symbol python-imports)))) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1902 (error nil)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1903 (sort |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1904 ;; 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
|
1905 (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
|
1906 #'string<)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1907 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1908 (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
|
1909 "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
|
1910 (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
|
1911 (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
|
1912 (and (re-search-backward |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1913 (rx (or buffer-start (regexp "[^[:alnum:]._]")) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1914 (group (1+ (regexp "[[:alnum:]._]"))) point) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1915 nil t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1916 (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
|
1917 (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
|
1918 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1919 (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
|
1920 "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
|
1921 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
|
1922 (interactive) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1923 (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
|
1924 (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
|
1925 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
|
1926 (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
|
1927 (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
|
1928 (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
|
1929 (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
|
1930 (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
|
1931 (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
|
1932 (scroll-up)))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1933 ;; Do completion. |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1934 (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
|
1935 (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
|
1936 (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
|
1937 (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
|
1938 (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
|
1939 (when symbol |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1940 (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
|
1941 ((null completion) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1942 (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
|
1943 (ding)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1944 ((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
|
1945 (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
|
1946 (insert completion)) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1947 (t |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1948 (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
|
1949 (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
|
1950 (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
|
1951 (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
|
1952 |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1953 (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
|
1954 "Completion function for Python for use with `hippie-expand'." |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
1955 (when (derived-mode-p 'python-mode) ; though we only add it locally |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1956 (unless old |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1957 (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
|
1958 (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
|
1959 (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
|
1960 (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
|
1961 (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
|
1962 (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
|
1963 (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
|
1964 (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
|
1965 (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
|
1966 (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
|
1967 (progn |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1968 (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
|
1969 t) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1970 (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
|
1971 nil))) |
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
1972 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1973 ;;;; FFAP support |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1974 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1975 (defun python-module-path (module) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1976 "Function for `ffap-alist' to return path to MODULE." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1977 (python-send-receive (format "emacs.modpath (%S)" module))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1978 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1979 (eval-after-load "ffap" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1980 '(push '(python-mode . python-module-path) ffap-alist)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1981 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1982 ;;;; Skeletons |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1983 |
73459
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1984 (defcustom python-use-skeletons nil |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1985 "Non-nil means template skeletons will be automagically inserted. |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1986 This happens when pressing \"if<SPACE>\", for example, to prompt for |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1987 the if condition." |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1988 :type 'boolean |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1989 :group 'python) |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
1990 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1991 (defvar python-skeletons nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1992 "Alist of named skeletons for Python mode. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1993 Elements are of the form (NAME . EXPANDER-FUNCTION).") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1994 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1995 (defvar python-mode-abbrev-table nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1996 "Abbrev table for Python mode. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1997 The default contents correspond to the elements of `python-skeletons'.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1998 (define-abbrev-table 'python-mode-abbrev-table ()) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
1999 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2000 (eval-when-compile |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2001 ;; Define a user-level skeleton and add it to `python-skeletons' and |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2002 ;; the abbrev table. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2003 (defmacro def-python-skeleton (name &rest elements) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2004 (let* ((name (symbol-name name)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2005 (function (intern (concat "python-insert-" name)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2006 `(progn |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2007 (add-to-list 'python-skeletons ',(cons name function)) |
73459
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
2008 (if python-use-skeletons |
664e876d97fd
2006-10-22 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
72936
diff
changeset
|
2009 (define-abbrev python-mode-abbrev-table ,name "" ',function nil t)) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2010 (define-skeleton ,function |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2011 ,(format "Insert Python \"%s\" template." name) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2012 ,@elements))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2013 (put 'def-python-skeleton 'lisp-indent-function 2) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2014 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2015 ;; From `skeleton-further-elements': |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2016 ;; `<': outdent a level; |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2017 ;; `^': delete indentation on current line and also previous newline. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2018 ;; Not quote like `delete-indentation'. Assumes point is at |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2019 ;; beginning of indentation. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2020 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2021 (def-python-skeleton if |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2022 "Condition: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2023 "if " str ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2024 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2025 ("other condition, %s: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2026 < ; Avoid wrong indentation after block opening. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2027 "elif " str ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2028 > _ \n nil) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2029 (python-else) | ^) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2030 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2031 (define-skeleton python-else |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2032 "Auxiliary skeleton." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2033 nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2034 (unless (eq ?y (read-char "Add `else' clause? (y for yes or RET for no) ")) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2035 (signal 'quit t)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2036 < "else:" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2037 > _ \n) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2038 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2039 (def-python-skeleton while |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2040 "Condition: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2041 "while " str ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2042 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2043 (python-else) | ^) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2044 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2045 (def-python-skeleton for |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2046 "Target, %s: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2047 "for " str " in " (skeleton-read "Expression, %s: ") ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2048 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2049 (python-else) | ^) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2050 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2051 (def-python-skeleton try/except |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2052 nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2053 "try:" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2054 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2055 ("Exception, %s: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2056 < "except " str (python-target) ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2057 > _ \n nil) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2058 < "except:" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2059 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2060 (python-else) | ^) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2061 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2062 (define-skeleton python-target |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2063 "Auxiliary skeleton." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2064 "Target, %s: " ", " str | -2) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2065 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2066 (def-python-skeleton try/finally |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2067 nil |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2068 "try:" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2069 > _ \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2070 < "finally:" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2071 > _ \n) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2072 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2073 (def-python-skeleton def |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2074 "Name: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2075 "def " str " (" ("Parameter, %s: " (unless (equal ?\( (char-before)) ", ") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2076 str) "):" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2077 "\"\"\"" @ " \"\"\"" \n ; Fixme: syntaxification wrong for """""" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2078 > _ \n) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2079 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2080 (def-python-skeleton class |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2081 "Name: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2082 "class " str " (" ("Inheritance, %s: " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2083 (unless (equal ?\( (char-before)) ", ") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2084 str) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2085 & ")" | -2 ; close list or remove opening |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2086 ":" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2087 "\"\"\"" @ " \"\"\"" \n |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2088 > _ \n) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2089 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2090 (defvar python-default-template "if" |
76570
6e293ce14a97
(python-default-template): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
76348
diff
changeset
|
2091 "Default template to expand by `python-expand-template'. |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2092 Updated on each expansion.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2093 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2094 (defun python-expand-template (name) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2095 "Expand template named NAME. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2096 Interactively, prompt for the name with completion." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2097 (interactive |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2098 (list (completing-read (format "Template to expand (default %s): " |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2099 python-default-template) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2100 python-skeletons nil t))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2101 (if (equal "" name) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2102 (setq name python-default-template) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2103 (setq python-default-template name)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2104 (let ((func (cdr (assoc name python-skeletons)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2105 (if func |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2106 (funcall func) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2107 (error "Undefined template: %s" name)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2108 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2109 ;;;; Bicycle Repair Man support |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2110 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2111 (autoload 'pymacs-load "pymacs" nil t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2112 (autoload 'brm-init "bikemacs") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2113 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2114 ;; I'm not sure how useful BRM really is, and it's certainly dangerous |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2115 ;; the way it modifies files outside Emacs... Also note that the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2116 ;; current BRM loses with tabs used for indentation -- I submitted a |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2117 ;; fix <URL:http://www.loveshack.ukfsn.org/emacs/bikeemacs.py.diff>. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2118 (defun python-setup-brm () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2119 "Set up Bicycle Repair Man refactoring tool (if available). |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2120 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2121 Note that the `refactoring' features change files independently of |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2122 Emacs and may modify and save the contents of the current buffer |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2123 without confirmation." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2124 (interactive) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2125 (condition-case data |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2126 (unless (fboundp 'brm-rename) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2127 (pymacs-load "bikeemacs" "brm-") ; first line of normal recipe |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2128 (let ((py-mode-map (make-sparse-keymap)) ; it assumes this |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2129 (features (cons 'python-mode features))) ; and requires this |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2130 (brm-init)) ; second line of normal recipe |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2131 (remove-hook 'python-mode-hook ; undo this from `brm-init' |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2132 '(lambda () (easy-menu-add brm-menu))) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2133 (easy-menu-define |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2134 python-brm-menu python-mode-map |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2135 "Bicycle Repair Man" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2136 '("BicycleRepairMan" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2137 :help "Interface to navigation and refactoring tool" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2138 "Queries" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2139 ["Find References" brm-find-references |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2140 :help "Find references to name at point in compilation buffer"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2141 ["Find Definition" brm-find-definition |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2142 :help "Find definition of name at point"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2143 "-" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2144 "Refactoring" |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2145 ["Rename" brm-rename |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2146 :help "Replace name at point with a new name everywhere"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2147 ["Extract Method" brm-extract-method |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2148 :active (and mark-active (not buffer-read-only)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2149 :help "Replace statements in region with a method"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2150 ["Extract Local Variable" brm-extract-local-variable |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2151 :active (and mark-active (not buffer-read-only)) |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2152 :help "Replace expression in region with an assignment"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2153 ["Inline Local Variable" brm-inline-local-variable |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2154 :help |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2155 "Substitute uses of variable at point with its definition"] |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2156 ;; Fixme: Should check for anything to revert. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2157 ["Undo Last Refactoring" brm-undo :help ""]))) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2158 (error (error "Bicyclerepairman setup failed: %s" data)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2159 |
54789 | 2160 ;;;; Modes. |
2161 | |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2162 (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
|
2163 (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
|
2164 |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2165 ;; Stuff to allow expanding abbrevs with non-word constituents. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2166 (defun python-abbrev-pc-hook () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2167 "Set the syntax table before possibly expanding abbrevs." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2168 (remove-hook 'post-command-hook 'python-abbrev-pc-hook t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2169 (set-syntax-table python-mode-syntax-table)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2170 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2171 (defvar python-abbrev-syntax-table |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2172 (copy-syntax-table python-mode-syntax-table) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2173 "Syntax table used when expanding abbrevs.") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2174 |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2175 (defun python-pea-hook () |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2176 "Reset the syntax table after possibly expanding abbrevs." |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2177 (set-syntax-table python-abbrev-syntax-table) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2178 (add-hook 'post-command-hook 'python-abbrev-pc-hook nil t)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2179 (modify-syntax-entry ?/ "w" python-abbrev-syntax-table) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2180 |
72527
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2181 (defvar python-mode-running) ;Dynamically scoped var. |
9d3a9b609c04
(python-preoutput-skip-next-prompt): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72461
diff
changeset
|
2182 |
54789 | 2183 ;;;###autoload |
2184 (define-derived-mode python-mode fundamental-mode "Python" | |
2185 "Major mode for editing Python files. | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2186 Font Lock mode is currently required for correct parsing of the source. |
54789 | 2187 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
|
2188 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
|
2189 commands for running Python under Emacs. |
54789 | 2190 |
2191 The Emacs commands which work with `defun's, e.g. \\[beginning-of-defun], deal | |
2192 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
|
2193 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
|
2194 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
|
2195 the end of definitions at that level, when they move up a level. |
54789 | 2196 \\<python-mode-map> |
2197 Colon is electric: it outdents the line if appropriate, e.g. for | |
2198 an else statement. \\[python-backspace] at the beginning of an indented statement | |
2199 deletes a level of indentation to close the current block; otherwise it | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2200 deletes a character backward. TAB indents the current line relative to |
54789 | 2201 the preceding code. Successive TABs, with no intervening command, cycle |
2202 through the possibilities for indentation on the basis of enclosing blocks. | |
2203 | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2204 \\[fill-paragraph] fills comments and multi-line strings appropriately, but has no |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2205 effect outside them. |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2206 |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2207 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
|
2208 Info-Look and Imenu. In Outline minor mode, `class' and `def' |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2209 lines count as headers. Symbol completion is available in the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2210 same way as in the Python shell using the `rlcompleter' module |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2211 and this is added to the Hippie Expand functions locally if |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2212 Hippie Expand mode is turned on. Completion of symbols of the |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2213 form x.y only works if the components are literal |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2214 module/attribute names, not variables. An abbrev table is set up |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2215 with skeleton expansions for compound statement templates. |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2216 |
54789 | 2217 \\{python-mode-map}" |
2218 :group 'python | |
2219 (set (make-local-variable 'font-lock-defaults) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2220 '(python-font-lock-keywords nil nil nil nil |
54789 | 2221 (font-lock-syntactic-keywords |
2222 . python-font-lock-syntactic-keywords) | |
60931
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
2223 ;; This probably isn't worth it. |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
2224 ;; (font-lock-syntactic-face-function |
494d942e49fe
(python-close-block-statement-p)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59996
diff
changeset
|
2225 ;; . python-font-lock-syntactic-face-function) |
54789 | 2226 )) |
2227 (set (make-local-variable 'parse-sexp-lookup-properties) t) | |
2228 (set (make-local-variable 'comment-start) "# ") | |
2229 (set (make-local-variable 'indent-line-function) #'python-indent-line) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2230 (set (make-local-variable 'indent-region-function) #'python-indent-region) |
54789 | 2231 (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
|
2232 (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
|
2233 (set (make-local-variable 'require-final-newline) mode-require-final-newline) |
54789 | 2234 (set (make-local-variable 'add-log-current-defun-function) |
2235 #'python-current-defun) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2236 (set (make-local-variable 'outline-regexp) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2237 (rx (* space) (or "class" "def" "elif" "else" "except" "finally" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2238 "for" "if" "try" "while") |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2239 symbol-end)) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2240 (set (make-local-variable 'outline-heading-end-regexp) ":\\s-*\n") |
54789 | 2241 (set (make-local-variable 'outline-level) #'python-outline-level) |
2242 (set (make-local-variable 'open-paren-in-column-0-is-defun-start) nil) | |
2243 (make-local-variable 'python-saved-check-command) | |
2244 (set (make-local-variable 'beginning-of-defun-function) | |
2245 'python-beginning-of-defun) | |
2246 (set (make-local-variable 'end-of-defun-function) 'python-end-of-defun) | |
2247 (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
|
2248 (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
|
2249 #'python-eldoc-function) |
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2250 (add-hook 'eldoc-mode-hook |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2251 (lambda () (run-python nil t)) ; need it running |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2252 nil t) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2253 ;; Fixme: should be in hideshow. This seems to be of limited use |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2254 ;; since it isn't (can't be) indentation-based. Also hide-level |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2255 ;; doesn't seem to work properly. |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2256 (add-to-list 'hs-special-modes-alist |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2257 `(python-mode "^\\s-*def\\>" nil "#" |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2258 ,(lambda (arg) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2259 (python-end-of-defun) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2260 (skip-chars-backward " \t\n")) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2261 nil)) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2262 (set (make-local-variable 'skeleton-further-elements) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2263 '((< '(backward-delete-char-untabify (min python-indent |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2264 (current-column)))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2265 (^ '(- (1+ (current-indentation)))))) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2266 (add-hook 'pre-abbrev-expand-hook 'python-pea-hook nil t) |
55397
a828ab1b3079
Changes largely merged in from Dave Love's code. Doc fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55300
diff
changeset
|
2267 (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
|
2268 (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
|
2269 (cons 'python-try-complete hippie-expand-try-functions-list))) |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2270 ;; Python defines TABs as being 8-char wide. |
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2271 (set (make-local-variable 'tab-width) 8) |
54789 | 2272 (when python-guess-indent (python-guess-indent)) |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2273 ;; Let's make it harder for the user to shoot himself in the foot. |
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2274 (unless (= tab-width python-indent) |
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2275 (setq indent-tabs-mode nil)) |
54789 | 2276 (set (make-local-variable 'python-command) python-python-command) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2277 (python-find-imports) |
54789 | 2278 (unless (boundp 'python-mode-running) ; kill the recursion from jython-mode |
2279 (let ((python-mode-running t)) | |
2280 (python-maybe-jython)))) | |
2281 | |
2282 (custom-add-option 'python-mode-hook 'imenu-add-menubar-index) | |
2283 (custom-add-option 'python-mode-hook | |
72461
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2284 (lambda () |
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2285 "Turn off Indent Tabs mode." |
2fee33a062da
Remove * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
72459
diff
changeset
|
2286 (set (make-local-variable 'indent-tabs-mode) nil))) |
54840
3768540a819c
Doc fixes. Changes for compiler warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54838
diff
changeset
|
2287 (custom-add-option 'python-mode-hook 'turn-on-eldoc-mode) |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2288 (custom-add-option 'python-mode-hook 'abbrev-mode) |
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2289 (custom-add-option 'python-mode-hook 'python-setup-brm) |
54789 | 2290 |
2291 ;;;###autoload | |
2292 (define-derived-mode jython-mode python-mode "Jython" | |
2293 "Major mode for editing Jython files. | |
2294 Like `python-mode', but sets up parameters for Jython subprocesses. | |
2295 Runs `jython-mode-hook' after `python-mode-hook'." | |
2296 :group 'python | |
2297 (set (make-local-variable 'python-command) python-jython-command)) | |
2298 | |
2299 (provide 'python) | |
72459
2657308de2f6
Update to Dave Love's latest version.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70219
diff
changeset
|
2300 (provide 'python-21) |
54789 | 2301 ;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554 |
2302 ;;; python.el ends here |