* lisp/progmodes/python.el: (python-indent, python-guess-indent,

  python-use-skeletons): New obsolete variable aliases.
  (python-indent-guess-indent-offset): Make interactive.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4fa8dff2a726ae10b917b869de0af92acf7e53ba..9bf89840e92a326c7a361606a31e64d780b83ba9 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -547,6 +547,12 @@ It makes underscores and dots word constituent chars.")
   :group 'python
   :safe 'booleanp)
 
+(define-obsolete-variable-alias
+  'python-indent 'python-indent-offset "24.2")
+
+(define-obsolete-variable-alias
+  'python-guess-indent 'python-indent-guess-indent-offset "24.2")
+
 (defvar python-indent-current-level 0
   "Current indentation level `python-indent-line-function' is using.")
 
@@ -560,6 +566,7 @@ These make `python-indent-calculate-indentation' subtract the value of
 
 (defun python-indent-guess-indent-offset ()
   "Guess and set `python-indent-offset' for the current buffer."
+  (interactive)
   (save-excursion
     (save-restriction
       (widen)
@@ -2117,6 +2124,9 @@ the if condition."
   :group 'python
   :safe 'booleanp)
 
+(define-obsolete-variable-alias
+  'python-use-skeletons 'python-skeleton-autoinsert "24.2")
+
 (defvar python-skeleton-available '()
   "Internal list of available skeletons.")