aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorPaul Eggert2011-12-10 16:56:50 -0800
committerPaul Eggert2011-12-10 16:56:50 -0800
commit8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch)
treec8129448cbbf387fe82667ccac02983592c688f1 /lisp/progmodes/python.el
parent85a83e2e2585a1906dec5168ed96ad521b5849ed (diff)
parent7b9d523a07395ecea505be88f45c33d73aea7038 (diff)
downloademacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz
emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a0a368777e7..fbf7c3c42f7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1122,7 +1122,7 @@ don't move and return nil. Otherwise return t."
1122 1122
1123;;;; Imenu. 1123;;;; Imenu.
1124 1124
1125;; For possibily speeding this up, here's the top of the ELP profile 1125;; For possibly speeding this up, here's the top of the ELP profile
1126;; for rescanning pydoc.py (2.2k lines, 90kb): 1126;; for rescanning pydoc.py (2.2k lines, 90kb):
1127;; Function Name Call Count Elapsed Time Average Time 1127;; Function Name Call Count Elapsed Time Average Time
1128;; ==================================== ========== ============= ============ 1128;; ==================================== ========== ============= ============
@@ -1549,7 +1549,7 @@ behavior, change `python-remove-cwd-from-path' to nil."
1549 (if path (concat path path-separator)) 1549 (if path (concat path path-separator))
1550 data-directory) 1550 data-directory)
1551 process-environment)) 1551 process-environment))
1552 ;; If we use a pipe, unicode characters are not printed 1552 ;; If we use a pipe, Unicode characters are not printed
1553 ;; correctly (Bug#5794) and IPython does not work at 1553 ;; correctly (Bug#5794) and IPython does not work at
1554 ;; all (Bug#5390). 1554 ;; all (Bug#5390).
1555 (process-connection-type t)) 1555 (process-connection-type t))