diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:09:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:09:29 -0700 |
| commit | c3ed7cea0a43ab86c9d3b1627878055844bc8656 (patch) | |
| tree | 4a46db8032e1b359be5284822828d12814d96e27 /lisp/progmodes/compile.el | |
| parent | 07fafe1edbba4a5eecbe133313b2eb6ec15e5c55 (diff) | |
| parent | 16e5e8e4ea4ad46157fcdeafb16f245124fba375 (diff) | |
| download | emacs-c3ed7cea0a43ab86c9d3b1627878055844bc8656.tar.gz | |
Merge from origin/emacs-25
16e5e8e Fix last change to isearch-update (bug#23406)
b755d98 Autoload cursor-sensor-inhibit (bug#23406)
b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call
86aa409 Followup for last commit in the user manual
7004459 Improve doc string of 'set-goal-column'
ccdaf04 Fix the MSDOS build
ffe701c Remove \= from format string (bug#18190)
1c58fa1 Fix variable-pitch font on MS-Windows
c6077bf Restore follow-scroll-up/down to scrolling by the combined si...
b671e21 Revert unneeded change which harms syntactic parsing. This f...
48b24c9 Correct indentation of ids in a C++ enum after a protection k...
5c3534f * lisp/window.el (window--process-window-list): No-op if no p...
734fb3a Port dumping to NetBSD with PaX
0255a70 Don't mistake `for' inside a function for a part of array com...
# Conflicts:
# src/Makefile.in
Diffstat (limited to 'lisp/progmodes/compile.el')
| -rw-r--r-- | lisp/progmodes/compile.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index cc04fe946b9..f2e397a4136 100644 --- 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'. |