diff options
| author | Fabián Ezequiel Gallina | 2012-05-17 00:03:12 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2012-05-17 00:03:12 -0300 |
| commit | 2ed294c5df967cf4700539f8e2842873813051cc (patch) | |
| tree | b314caf2dc7ef8247fc0970c5d129edae76e5d8c /lisp/progmodes/python.el | |
| parent | c2cb97aec2d940c21629b7872fafc9998f673dae (diff) | |
| download | emacs-2ed294c5df967cf4700539f8e2842873813051cc.tar.gz emacs-2ed294c5df967cf4700539f8e2842873813051cc.zip | |
Replaced references from python-beginning-of-innermost-defun to python-beginning-of-defun-function
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index be5221cee28..6295dad559e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1251,18 +1251,17 @@ the output." | |||
| 1251 | (python-shell-send-region (point-min) (point-max)))) | 1251 | (python-shell-send-region (point-min) (point-max)))) |
| 1252 | 1252 | ||
| 1253 | (defun python-shell-send-defun (arg) | 1253 | (defun python-shell-send-defun (arg) |
| 1254 | "Send the (inner|outer)most def or class to inferior Python process. | 1254 | "Send the current defun to inferior Python process. |
| 1255 | When argument ARG is non-nil sends the innermost defun." | 1255 | When argument ARG is non-nil sends the innermost defun." |
| 1256 | (interactive "P") | 1256 | (interactive "P") |
| 1257 | (save-excursion | 1257 | (save-excursion |
| 1258 | (python-shell-send-region (progn | 1258 | (python-shell-send-region |
| 1259 | (or (if arg | 1259 | (progn |
| 1260 | (python-beginning-of-innermost-defun) | 1260 | (or (python-beginning-of-defun-function) |
| 1261 | (python-beginning-of-defun-function)) | 1261 | (progn (beginning-of-line) (point-marker)))) |
| 1262 | (progn (beginning-of-line) (point-marker)))) | 1262 | (progn |
| 1263 | (progn | 1263 | (or (python-end-of-defun-function) |
| 1264 | (or (python-end-of-defun-function) | 1264 | (progn (end-of-line) (point-marker))))))) |
| 1265 | (progn (end-of-line) (point-marker))))))) | ||
| 1266 | 1265 | ||
| 1267 | (defun python-shell-send-file (file-name &optional process temp-file-name) | 1266 | (defun python-shell-send-file (file-name &optional process temp-file-name) |
| 1268 | "Send FILE-NAME to inferior Python PROCESS. | 1267 | "Send FILE-NAME to inferior Python PROCESS. |
| @@ -1943,7 +1942,7 @@ not inside a defun." | |||
| 1943 | (when (not (>= (current-indentation) python-indent-offset)) | 1942 | (when (not (>= (current-indentation) python-indent-offset)) |
| 1944 | (while (and (not (eobp)) (forward-comment 1)))) | 1943 | (while (and (not (eobp)) (forward-comment 1)))) |
| 1945 | (while (and (not (equal 0 (current-indentation))) | 1944 | (while (and (not (equal 0 (current-indentation))) |
| 1946 | (python-beginning-of-innermost-defun)) | 1945 | (python-beginning-of-defun-function)) |
| 1947 | (back-to-indentation) | 1946 | (back-to-indentation) |
| 1948 | (looking-at "\\(?:def\\|class\\) +\\([^(]+\\)[^:]+:\\s-*\n") | 1947 | (looking-at "\\(?:def\\|class\\) +\\([^(]+\\)[^:]+:\\s-*\n") |
| 1949 | (setq names (cons (match-string-no-properties 1) names))))) | 1948 | (setq names (cons (match-string-no-properties 1) names))))) |