upstream

3 files changed, 38 insertions, 38 deletions

diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index a53d65f6307..76e3002abd2 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -399,14 +399,10 @@ Example:
                 str2 "@protocol")))
         (setq str (cc-imenu-objc-remove-white-space str))
         (setq methodlist (cons (cons str2
-                              (match-beginning langnum))
+                                     (match-beginning langnum))
                                methodlist))
-        (setq toplist (cons nil (cons (cons str
-                                          methodlist) toplist))
+        (setq toplist (cons (cons str methodlist) toplist)
               methodlist nil))))
-    ;;
-    (if (eq (car toplist) nil)
-        (setq toplist (cdr toplist)))
 
     ;; In this buffer, there is only one or zero @{interface|implementation|protocol}.
     (if (< classcount 2)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 23a34b85194..80afdc0bedf 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2487,20 +2487,23 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
         (let ((file (bindat-get-field breakpoint 'fullname))
               (flag (bindat-get-field breakpoint 'enabled))
               (bptno (bindat-get-field breakpoint 'number)))
-          (unless (file-exists-p file)
+          (unless (and file (file-exists-p file))
             (setq file (cdr (assoc bptno gdb-location-alist))))
-          (if (and file
-                   (not (string-equal file "File not found")))
-              (with-current-buffer
-                  (find-file-noselect file 'nowarn)
-                (gdb-init-buffer)
-                ;; Only want one breakpoint icon at each location.
-                (gdb-put-breakpoint-icon (string-equal flag "y") bptno
-                                         (string-to-number line)))
-            (gdb-input (concat "list " file ":1") 'ignore)
-            (gdb-input "-file-list-exec-source-file"
-                       `(lambda () (gdb-get-location
-                                    ,bptno ,line ,flag)))))))))
+          (if (or (null file)
+                  (string-equal file "File not found"))
+              ;; If the full filename is not recorded in the
+              ;; breakpoint structure or in `gdb-location-alist', use
+              ;; -file-list-exec-source-file to extract it.
+              (when (setq file (bindat-get-field breakpoint 'file))
+                (gdb-input (concat "list " file ":1") 'ignore)
+                (gdb-input "-file-list-exec-source-file"
+                           `(lambda () (gdb-get-location
+                                        ,bptno ,line ,flag))))
+            (with-current-buffer (find-file-noselect file 'nowarn)
+              (gdb-init-buffer)
+              ;; Only want one breakpoint icon at each location.
+              (gdb-put-breakpoint-icon (string-equal flag "y") bptno
+                                       (string-to-number line)))))))))
 
 (defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"")
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 132951aedc8..4617ecc420d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -250,6 +250,7 @@
     (define-key map "\C-c\C-tt" 'python-skeleton-try)
     (define-key map "\C-c\C-tw" 'python-skeleton-while)
     ;; Shell interaction
+    (define-key map "\C-c\C-p" 'run-python)
     (define-key map "\C-c\C-s" 'python-shell-send-string)
     (define-key map "\C-c\C-r" 'python-shell-send-region)
     (define-key map "\C-\M-x" 'python-shell-send-defun)
@@ -1544,7 +1545,7 @@ variable.
             'python-shell-completion-complete-at-point nil 'local)
   (add-to-list (make-local-variable 'comint-dynamic-complete-functions)
                'python-shell-completion-complete-at-point)
-  (define-key inferior-python-mode-map (kbd "<tab>")
+  (define-key inferior-python-mode-map "\t"
     'python-shell-completion-complete-or-indent)
   (when python-shell-enable-font-lock
     (set (make-local-variable 'font-lock-defaults)
@@ -1571,30 +1572,33 @@ non-nil the buffer is shown."
           (with-current-buffer buffer
             (inferior-python-mode)
             (python-util-clone-local-variables current-buffer))))
-      (when pop
-        (pop-to-buffer proc-buffer-name))
+      (and pop (pop-to-buffer proc-buffer-name t))
       proc-buffer-name)))
 
-(defun run-python (dedicated cmd)
+;;;###autoload
+(defun run-python (cmd &optional dedicated show)
   "Run an inferior Python process.
 Input and output via buffer named after
 `python-shell-buffer-name'.  If there is a process already
 running in that buffer, just switch to it.
-With argument, allows you to define DEDICATED, so a dedicated
-process for the current buffer is open, and define CMD so you can
-edit the command used to call the interpreter (default is value
-of `python-shell-interpreter' and arguments defined in
-`python-shell-interpreter-args').  Runs the hook
-`inferior-python-mode-hook' (after the `comint-mode-hook' is
-run).
-\(Type \\[describe-mode] in the process buffer for a list of commands.)"
+
+With argument, allows you to define CMD so you can edit the
+command used to call the interpreter and define DEDICATED, so a
+dedicated process for the current buffer is open.  When numeric
+prefix arg is other than 0 or 4 do not SHOW.
+
+Runs the hook `inferior-python-mode-hook' (after the
+`comint-mode-hook' is run).  \(Type \\[describe-mode] in the
+process buffer for a list of commands.)"
   (interactive
    (if current-prefix-arg
        (list
+        (read-string "Run Python: " (python-shell-parse-command))
         (y-or-n-p "Make dedicated process? ")
-        (read-string "Run Python: " (python-shell-parse-command)))
-     (list nil (python-shell-parse-command))))
-  (python-shell-make-comint cmd (python-shell-get-process-name dedicated))
+        (= (prefix-numeric-value current-prefix-arg) 4))
+     (list (python-shell-parse-command) nil t)))
+  (python-shell-make-comint
+   cmd (python-shell-get-process-name dedicated) show)
   dedicated)
 
 (defun run-python-internal ()
@@ -1611,7 +1615,6 @@ with user shells.  Runs the hook
 `inferior-python-mode-hook' (after the `comint-mode-hook' is
 run).  \(Type \\[describe-mode] in the process buffer for a list
 of commands.)"
-  (interactive)
   (set-process-query-on-exit-flag
    (get-buffer-process
     (python-shell-make-comint
@@ -1638,7 +1641,7 @@ of commands.)"
          (global-proc-buffer-name (format "*%s*" global-proc-name))
          (dedicated-running (comint-check-proc dedicated-proc-buffer-name))
          (global-running (comint-check-proc global-proc-buffer-name))
-         (current-prefix-arg 4))
+         (current-prefix-arg 16))
     (when (and (not dedicated-running) (not global-running))
       (if (call-interactively 'run-python)
           (setq dedicated-running t)
@@ -1945,7 +1948,6 @@ completions on the current context."
 
 (defun python-shell-completion-complete-at-point ()
   "Perform completion at point in inferior Python process."
-  (interactive)
   (and comint-last-prompt-overlay
        (> (point-marker) (overlay-end comint-last-prompt-overlay))
        (python-shell-completion--do-completion-at-point
@@ -2060,7 +2062,6 @@ Argument OUTPUT is a string with the output from the comint process."
 For this to work the best as possible you should call
 `python-shell-send-buffer' from time to time so context in
 inferior python process is updated properly."
-  (interactive)
   (let ((process (python-shell-get-process)))
     (if (not process)
         (error "Completion needs an inferior Python process running")