Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org

2 files changed, 4 insertions, 3 deletions

diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index a082d75b3c4..853f2d0dad2 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1079,7 +1079,7 @@ VERSION is of the format (Major . Minor)"
   ;; Inherited from the old prolog.el.
   (define-key map "\e\C-x" 'prolog-consult-region)
   (define-key map "\C-c\C-l" 'prolog-consult-file)
-  (define-key map "\C-c\C-z" 'switch-to-prolog))
+  (define-key map "\C-c\C-z" 'run-prolog))
 
 (defun prolog-mode-keybindings-inferior (_map)
   "Define keybindings for inferior Prolog mode in MAP."
@@ -1240,6 +1240,8 @@ To find out what version of Prolog mode you are running, enter
         ((string-match "\\`[rf] *[0-9]*\\'" str) nil) ;r(edo) or f(ail)
         (t t)))
 
+;; This statement was missing in Emacs 24.1, 24.2, 24.3.
+(define-obsolete-function-alias 'switch-to-prolog 'run-prolog "24.1")
 ;;;###autoload
 (defun run-prolog (arg)
   "Run an inferior Prolog process, input and output via buffer *prolog*.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7d882837abc..b08da8da029 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2332,7 +2332,6 @@ interpreter is run.  Variables
 `python-shell-font-lock-enable',
 `python-shell-completion-setup-code',
 `python-shell-completion-string-code',
-`python-shell-completion-module-string-code',
 `python-eldoc-setup-code', `python-eldoc-string-code',
 `python-ffap-setup-code' and `python-ffap-string-code' can
 customize this mode for different Python interpreters.
@@ -2408,7 +2407,7 @@ killed."
                               interpreter nil args))
                (python-shell--parent-buffer (current-buffer))
                (process (get-buffer-process buffer))
-               ;; As the user may have overriden default values for
+               ;; As the user may have overridden default values for
                ;; these vars on `run-python', let-binding them allows
                ;; to have the new right values in all setup code
                ;; that's is done in `inferior-python-mode', which is