Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f54b7c9f928..66779acb103 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -65,7 +65,6 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
   (require 'compile)
   (require 'comint)
   (require 'hippie-exp))
@@ -1224,6 +1223,9 @@ local value.")
     ;; (modify-syntax-entry ?\" "." st)
     st))
 
+;; Autoloaded.
+(declare-function compilation-shell-minor-mode "compile" (&optional arg))
+
 ;; Fixme: This should inherit some stuff from `python-mode', but I'm
 ;; not sure how much: at least some keybindings, like C-c C-f;
 ;; syntax?; font-locking, e.g. for triple-quoted strings?
@@ -1656,6 +1658,8 @@ instance.  Assumes an inferior Python is running."
 
 ;;;; Info-look functionality.
 
+(declare-function info-lookup-maybe-add-help "info-look" (&rest arg))
+
 (defun python-after-info-look ()
   "Set up info-look for Python.
 Used with `eval-after-load'."