upstream

4 files changed, 23 insertions, 11 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 2a000957589..50eaebe4dec 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1703,7 +1703,9 @@ Key bindings:
   (message "Using CC Mode version %s" c-version)
   (c-keep-region-active))
 
-(defvar c-prepare-bug-report-hooks nil)
+(define-obsolete-variable-alias 'c-prepare-bug-report-hooks
+  'c-prepare-bug-report-hook "24.3")
+(defvar c-prepare-bug-report-hook nil)
 
 ;; Dynamic variables used by reporter.
 (defvar reporter-prompt-for-summary-p)
@@ -1770,7 +1772,7 @@ Key bindings:
                 lookup-syntax-properties))
         vars)
       (lambda ()
-        (run-hooks 'c-prepare-bug-report-hooks)
+        (run-hooks 'c-prepare-bug-report-hook)
         (insert (format "Buffer Style: %s\nc-emacs-features: %s\n"
                         style c-features)))))))
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 10fd7a75eaa..06525b354b1 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1568,12 +1568,20 @@ Returns the compilation buffer created."
         ;; Then evaluate a cd command if any, but don't perform it yet, else
         ;; start-command would do it again through the shell: (cd "..") AND
         ;; sh -c "cd ..; make"
-        (cd (if (string-match "\\`\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]"
-                              command)
-                (if (match-end 1)
-                    (substitute-env-vars (match-string 1 command))
-                  "~")
-              default-directory))
+        (cd (cond
+             ((not (string-match "\\`\\s *cd\\(?:\\s +\\(\\S +?\\|'[^']*'\\|\"\\(?:[^\"`$\\]\\|\\\\.\\)*\"\\)\\)?\\s *[;&\n]"
+                                 command))
+              default-directory)
+             ((not (match-end 1)) "~")
+             ((eq (aref command (match-beginning 1)) ?\')
+              (substring command (1+ (match-beginning 1))
+                         (1- (match-end 1))))
+             ((eq (aref command (match-beginning 1)) ?\")
+              (replace-regexp-in-string
+               "\\\\\\(.\\)" "\\1"
+               (substring command (1+ (match-beginning 1))
+                          (1- (match-end 1)))))
+             (t (substitute-env-vars (match-string 1 command)))))
         (erase-buffer)
         ;; Select the desired mode.
         (if (not (eq mode t))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 719471278a8..13eac8392a2 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -148,7 +148,8 @@ Used to gray out relevant toolbar icons.")
     ([run]      menu-item "Run" gud-run
                   :enable (not gud-running)
                   :visible (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-    ([go]       menu-item (if gdb-active-process "Continue" "Run") gud-go
+    ([go]       menu-item (if (bound-and-true-p gdb-active-process)
+                              "Continue" "Run") gud-go
                   :visible (and (eq gud-minor-mode 'gdbmi)
                                 (gdb-show-run-p)))
     ([stop]     menu-item "Stop" gud-stop-subjob
@@ -178,7 +179,7 @@ Used to gray out relevant toolbar icons.")
                                  '(gdbmi gdb dbx xdb jdb pdb)))
     ([pp]       menu-item "Print S-expression" gud-pp
                   :enable (and (not gud-running)
-                                  gdb-active-process)
+                                  (bound-and-true-p gdb-active-process))
                   :visible (and (string-equal
                                  (buffer-local-value
                                   'gud-target-name gud-comint-buffer) "emacs")
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4819149bdf6..c2ce12b6ad4 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -182,7 +182,8 @@ and you want to simplify them for the mode line
 (defconst which-func-current
   '(:eval (replace-regexp-in-string
            "%" "%%"
-           (gethash (selected-window) which-func-table which-func-unknown))))
+           (or (gethash (selected-window) which-func-table)
+               which-func-unknown))))
 ;;;###autoload (put 'which-func-current 'risky-local-variable t)
 
 (defvar which-func-mode nil