aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2010-10-01 10:16:39 +0200
committerEli Zaretskii2010-10-01 10:16:39 +0200
commit19d5deefe5640970a2e0b73a16d3f624fa2a7ef4 (patch)
tree03cfd4b1e413d9a120ddf608ad8a524f88b4236c
parent1fcaf927dbe0165270b768950994a852d61399f7 (diff)
downloademacs-19d5deefe5640970a2e0b73a16d3f624fa2a7ef4.tar.gz
emacs-19d5deefe5640970a2e0b73a16d3f624fa2a7ef4.zip
Fix bug #7102.
gmake.defs: Add a comment with a single quote to fix fontification.
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/gmake.defs1
2 files changed, 6 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 03e4546c36c..25c274c4f9a 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12010-10-01 Eli Zaretskii <eliz@gnu.org>
2
3 * gmake.defs: Add a comment with a single quote to fix
4 fontification. (Bug#7102)
5
12010-09-29 Eli Zaretskii <eliz@gnu.org> 62010-09-29 Eli Zaretskii <eliz@gnu.org>
2 7
3 * configure.bat: Fix the condition for copying paths.h into 8 * configure.bat: Fix the condition for copying paths.h into
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 491e6512066..2265841efa3 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -96,6 +96,7 @@ THISDIR = .
96ifdef USING_SH 96ifdef USING_SH
97sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) 97sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
98sh_output := $(shell echo foo") 98sh_output := $(shell echo foo")
99# This single quote " is to fix fintification due to previous line
99ifeq "$(sh_output)" "" 100ifeq "$(sh_output)" ""
100NEW_CYGWIN = 1 101NEW_CYGWIN = 1
101endif 102endif