diff options
| author | Fabián Ezequiel Gallina | 2012-05-17 00:03:41 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2012-05-17 00:03:41 -0300 |
| commit | 90a41b9dc2f64c4cd087ca4651dbf6066617fb4f (patch) | |
| tree | bf337c5692ca6a73e8b852fad94863395cda38af /lisp/progmodes/python.el | |
| parent | 035c45e336a3ef831bfdb3bbfcfa1bb925c9783b (diff) | |
| download | emacs-90a41b9dc2f64c4cd087ca4651dbf6066617fb4f.tar.gz emacs-90a41b9dc2f64c4cd087ca4651dbf6066617fb4f.zip | |
Removed tabs and fixed indentation in several parts.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1b98a046b6a..3eed67ab3a4 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -321,9 +321,9 @@ | |||
| 321 | (* (any word ?_)))) | 321 | (* (any word ?_)))) |
| 322 | `(defun . ,(rx symbol-start (or "def" "class") symbol-end)) | 322 | `(defun . ,(rx symbol-start (or "def" "class") symbol-end)) |
| 323 | `(if-name-main . ,(rx line-start "if" (+ space) "__name__" | 323 | `(if-name-main . ,(rx line-start "if" (+ space) "__name__" |
| 324 | (+ space) "==" (+ space) | 324 | (+ space) "==" (+ space) |
| 325 | (any ?' ?\") "__main__" (any ?' ?\") | 325 | (any ?' ?\") "__main__" (any ?' ?\") |
| 326 | (* space) ?:)) | 326 | (* space) ?:)) |
| 327 | `(symbol-name . ,(rx (any letter ?_) (* (any word ?_)))) | 327 | `(symbol-name . ,(rx (any letter ?_) (* (any word ?_)))) |
| 328 | `(open-paren . ,(rx (or "{" "[" "("))) | 328 | `(open-paren . ,(rx (or "{" "[" "("))) |
| 329 | `(close-paren . ,(rx (or "}" "]" ")"))) | 329 | `(close-paren . ,(rx (or "}" "]" ")"))) |
| @@ -1620,11 +1620,11 @@ With prefix arg include lines protected by \"if __name__ == '__main__':\"" | |||
| 1620 | (python-shell-send-region | 1620 | (python-shell-send-region |
| 1621 | (point-min) | 1621 | (point-min) |
| 1622 | (or (and | 1622 | (or (and |
| 1623 | (not arg) | 1623 | (not arg) |
| 1624 | (save-excursion | 1624 | (save-excursion |
| 1625 | (re-search-forward (python-rx if-name-main) nil t)) | 1625 | (re-search-forward (python-rx if-name-main) nil t)) |
| 1626 | (match-beginning 0)) | 1626 | (match-beginning 0)) |
| 1627 | (point-max))))) | 1627 | (point-max))))) |
| 1628 | 1628 | ||
| 1629 | (defun python-shell-send-defun (arg) | 1629 | (defun python-shell-send-defun (arg) |
| 1630 | "Send the current defun to inferior Python process. | 1630 | "Send the current defun to inferior Python process. |
| @@ -1795,16 +1795,16 @@ completions on the current context." | |||
| 1795 | (concat "^" python-shell-prompt-regexp) prompt) | 1795 | (concat "^" python-shell-prompt-regexp) prompt) |
| 1796 | 'default) | 1796 | 'default) |
| 1797 | (t nil))) | 1797 | (t nil))) |
| 1798 | (completion-code | 1798 | (completion-code |
| 1799 | (case completion-context | 1799 | (case completion-context |
| 1800 | ('pdb python-shell-completion-pdb-string-code) | 1800 | ('pdb python-shell-completion-pdb-string-code) |
| 1801 | ('import python-shell-completion-module-string-code) | 1801 | ('import python-shell-completion-module-string-code) |
| 1802 | ('default python-shell-completion-string-code) | 1802 | ('default python-shell-completion-string-code) |
| 1803 | (t nil))) | 1803 | (t nil))) |
| 1804 | (input | 1804 | (input |
| 1805 | (if (eq completion-context 'import) | 1805 | (if (eq completion-context 'import) |
| 1806 | (replace-regexp-in-string "^[ \t]+" "" line) | 1806 | (replace-regexp-in-string "^[ \t]+" "" line) |
| 1807 | input)) | 1807 | input)) |
| 1808 | (completions | 1808 | (completions |
| 1809 | (and completion-code (> (length input) 0) | 1809 | (and completion-code (> (length input) 0) |
| 1810 | (python-shell-completion--get-completions | 1810 | (python-shell-completion--get-completions |