aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLeo Liu2012-04-17 03:28:57 +0800
committerLeo Liu2012-04-17 03:28:57 +0800
commitf45f90f33151dc74ef541cba4fe87565215382a0 (patch)
tree69aae8572c97d19dad475053497673e581c00ae7 /lisp
parent099e72021d771b307875f1c4fc6dd1aedd786089 (diff)
downloademacs-f45f90f33151dc74ef541cba4fe87565215382a0.tar.gz
emacs-f45f90f33151dc74ef541cba4fe87565215382a0.zip
* lisp/progmodes/python.el: Trivial cleanup.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/python.el10
2 files changed, 5 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f790ab0dc5..801a5e74804 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-16 Leo Liu <sdl.web@gmail.com>
2
3 * progmodes/python.el: Trivial cleanup.
4
12012-04-16 Glenn Morris <rgm@gnu.org> 52012-04-16 Glenn Morris <rgm@gnu.org>
2 6
3 * emacs-lisp/eieio-opt.el (describe-class, describe-generic): 7 * emacs-lisp/eieio-opt.el (describe-class, describe-generic):
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 09b89993626..6f8758ebec1 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -69,11 +69,7 @@
69(require 'comint) 69(require 'comint)
70(require 'ansi-color) 70(require 'ansi-color)
71 71
72(eval-when-compile 72(eval-when-compile (require 'compile))
73 (require 'compile)
74 (require 'hippie-exp))
75
76(autoload 'comint-mode "comint")
77 73
78(defgroup python nil 74(defgroup python nil
79 "Silly walks in the Python language." 75 "Silly walks in the Python language."
@@ -1488,8 +1484,6 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
1488 res) 1484 res)
1489 (t (concat res s))))) 1485 (t (concat res s)))))
1490 1486
1491(autoload 'comint-check-proc "comint")
1492
1493(defvar python-version-checked nil) 1487(defvar python-version-checked nil)
1494(defun python-check-version (cmd) 1488(defun python-check-version (cmd)
1495 "Check that CMD runs a suitable version of Python." 1489 "Check that CMD runs a suitable version of Python."
@@ -1684,8 +1678,6 @@ value to determine defaults."
1684 "Caches (directory . file) pair used in the last `python-load-file' command. 1678 "Caches (directory . file) pair used in the last `python-load-file' command.
1685Used for determining the default in the next one.") 1679Used for determining the default in the next one.")
1686 1680
1687(autoload 'comint-get-source "comint")
1688
1689(defun python-load-file (file-name) 1681(defun python-load-file (file-name)
1690 "Load a Python file FILE-NAME into the inferior Python process. 1682 "Load a Python file FILE-NAME into the inferior Python process.
1691If the file has extension `.py' import or reload it as a module. 1683If the file has extension `.py' import or reload it as a module.