aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-12-17 20:06:16 -0500
committerGlenn Morris2013-12-17 20:06:16 -0500
commit9cdb8d8556bac927d1391a859e0737d50e07d7f5 (patch)
tree75154481e30ac9f52918ac68e6ad65911fc6b168 /src
parentccc9f6dc473fd77dbcf4ce89cd916fd03201df3a (diff)
downloademacs-9cdb8d8556bac927d1391a859e0737d50e07d7f5.tar.gz
emacs-9cdb8d8556bac927d1391a859e0737d50e07d7f5.zip
* src/emacs.c (standard_args) [HAVE_NS]: Remove -disable-font-backend.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0fe25e6fd63..5933f145b48 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-18 Glenn Morris <rgm@gnu.org>
2
3 * emacs.c (standard_args) [HAVE_NS]: Remove -disable-font-backend.
4
12013-12-17 Eli Zaretskii <eliz@gnu.org> 52013-12-17 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32.c (getloadavg): Don't index samples[] array with negative 7 * w32.c (getloadavg): Don't index samples[] array with negative
diff --git a/src/emacs.c b/src/emacs.c
index 2dfd12eff8b..89e04b12b45 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1714,7 +1714,6 @@ static const struct standard_args standard_args[] =
1714#ifdef HAVE_NS 1714#ifdef HAVE_NS
1715 { "-NSAutoLaunch", 0, 5, 1 }, 1715 { "-NSAutoLaunch", 0, 5, 1 },
1716 { "-NXAutoLaunch", 0, 5, 1 }, 1716 { "-NXAutoLaunch", 0, 5, 1 },
1717 { "-disable-font-backend", "--disable-font-backend", 65, 0 },
1718 { "-_NSMachLaunch", 0, 85, 1 }, 1717 { "-_NSMachLaunch", 0, 85, 1 },
1719 { "-MachLaunch", 0, 85, 1 }, 1718 { "-MachLaunch", 0, 85, 1 },
1720 { "-macosx", 0, 85, 0 }, 1719 { "-macosx", 0, 85, 0 },