summaryrefslogtreecommitdiff
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el20
1 files changed, 6 insertions, 14 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3ef872d26eb..2922330e6f9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -69,11 +69,7 @@
(require 'comint)
(require 'ansi-color)
-(eval-when-compile
- (require 'compile)
- (require 'hippie-exp))
-
-(autoload 'comint-mode "comint")
+(eval-when-compile (require 'compile))
(defgroup python nil
"Silly walks in the Python language."
@@ -494,7 +490,7 @@ statement."
(defcustom python-pdbtrack-do-tracking-p t
- "*Controls whether the pdbtrack feature is enabled or not.
+ "Controls whether the pdbtrack feature is enabled or not.
When non-nil, pdbtrack is enabled in all comint-based buffers,
e.g. shell interaction buffers and the *Python* buffer.
@@ -509,7 +505,7 @@ having to restart the program."
(make-variable-buffer-local 'python-pdbtrack-do-tracking-p)
(defcustom python-pdbtrack-minor-mode-string " PDB"
- "*Minor-mode sign to be displayed when pdbtrack is active."
+ "Minor-mode sign to be displayed when pdbtrack is active."
:type 'string
:group 'python)
@@ -1288,7 +1284,7 @@ modified by the user. Additional arguments are added when the command
is used by `run-python' et al.")
(defvar python-buffer nil
- "*The current Python process buffer.
+ "The current Python process buffer.
Commands that send text from source buffers to Python processes have
to choose a process to send to. This is determined by buffer-local
@@ -1488,8 +1484,6 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
res)
(t (concat res s)))))
-(autoload 'comint-check-proc "comint")
-
(defvar python-version-checked nil)
(defun python-check-version (cmd)
"Check that CMD runs a suitable version of Python."
@@ -1684,8 +1678,6 @@ value to determine defaults."
"Caches (directory . file) pair used in the last `python-load-file' command.
Used for determining the default in the next one.")
-(autoload 'comint-get-source "comint")
-
(defun python-load-file (file-name)
"Load a Python file FILE-NAME into the inferior Python process.
If the file has extension `.py' import or reload it as a module.
@@ -1776,7 +1768,7 @@ will."
;; allow C-c C-f in help buffer.
(let ((temp-buffer-show-hook ; avoid xref stuff
(lambda ()
- (toggle-read-only 1)
+ (setq buffer-read-only t)
(setq view-return-to-alist
(list (cons (selected-window) help-return-method))))))
(with-output-to-temp-buffer (help-buffer)
@@ -1959,7 +1951,7 @@ the string's indentation."
;; paragraph in a multi-line string properly, so narrow
;; to the string and then fill around (the end of) the
;; current line.
- ((eq t (nth 3 syntax)) ; in fenced string
+ ((nth 3 syntax) ; in fenced string
(goto-char (nth 8 syntax)) ; string start
(setq start (line-beginning-position))
(setq end (condition-case () ; for unbalanced quotes