Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / compile.el

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 0160aab901c6e503b140bdda60931f2de38841ac..f2e397a4136ba9ba149891c7d5701ac0e44650cd 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1743,7 +1743,7 @@ Returns the compilation buffer created."
            (funcall compilation-process-setup-function))
        (and outwin (compilation-set-window-height outwin))
        ;; Start the compilation.
-       (if (fboundp 'start-process)
+       (if (fboundp 'make-process)
            (let ((proc
                   (if (eq mode t)
                       ;; comint uses `start-file-process'.
@@ -2760,7 +2760,9 @@ FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME).
 In the former case, FILENAME may be relative or absolute.
 
 The file-structure looks like this:
-  ((FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)"
+  ((FILENAME [TRUE-DIRNAME]) FMT ...)
+
+TRUE-DIRNAME is the `file-truename' of DIRNAME, if given."
   (or (gethash file compilation-locs)
       ;; File was not previously encountered, at least not in the form passed.
       ;; Let's normalize it and look again.
@@ -2815,7 +2817,7 @@ The file-structure looks like this:
   (let ((fs (compilation-get-file-structure file)))
     (cl-assert (eq fs (gethash file compilation-locs)))
     (cl-assert (eq fs (gethash (cons (caar fs) (cadr (car fs)))
-                            compilation-locs)))
+                               compilation-locs)))
     (maphash (lambda (k v)
                (if (eq v fs) (remhash k compilation-locs)))
              compilation-locs)))