From: Fabián Ezequiel Gallina Date: Thu, 17 May 2012 03:03:41 +0000 (-0300) Subject: Removed tabs and fixed indentation in several parts. X-Git-Tag: emacs-24.2.90~1199^2~492 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90a41b9dc2f64c4cd087ca4651dbf6066617fb4f;p=emacs.git Removed tabs and fixed indentation in several parts. --- 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 @@ (* (any word ?_)))) `(defun . ,(rx symbol-start (or "def" "class") symbol-end)) `(if-name-main . ,(rx line-start "if" (+ space) "__name__" - (+ space) "==" (+ space) - (any ?' ?\") "__main__" (any ?' ?\") - (* space) ?:)) + (+ space) "==" (+ space) + (any ?' ?\") "__main__" (any ?' ?\") + (* space) ?:)) `(symbol-name . ,(rx (any letter ?_) (* (any word ?_)))) `(open-paren . ,(rx (or "{" "[" "("))) `(close-paren . ,(rx (or "}" "]" ")"))) @@ -1620,11 +1620,11 @@ With prefix arg include lines protected by \"if __name__ == '__main__':\"" (python-shell-send-region (point-min) (or (and - (not arg) - (save-excursion - (re-search-forward (python-rx if-name-main) nil t)) - (match-beginning 0)) - (point-max))))) + (not arg) + (save-excursion + (re-search-forward (python-rx if-name-main) nil t)) + (match-beginning 0)) + (point-max))))) (defun python-shell-send-defun (arg) "Send the current defun to inferior Python process. @@ -1795,16 +1795,16 @@ completions on the current context." (concat "^" python-shell-prompt-regexp) prompt) 'default) (t nil))) - (completion-code - (case completion-context - ('pdb python-shell-completion-pdb-string-code) - ('import python-shell-completion-module-string-code) - ('default python-shell-completion-string-code) - (t nil))) - (input - (if (eq completion-context 'import) - (replace-regexp-in-string "^[ \t]+" "" line) - input)) + (completion-code + (case completion-context + ('pdb python-shell-completion-pdb-string-code) + ('import python-shell-completion-module-string-code) + ('default python-shell-completion-string-code) + (t nil))) + (input + (if (eq completion-context 'import) + (replace-regexp-in-string "^[ \t]+" "" line) + input)) (completions (and completion-code (> (length input) 0) (python-shell-completion--get-completions