merge trunk

author: Kenichi Handa 2010-08-25 14:15:20 +0900
committer: Kenichi Handa 2010-08-25 14:15:20 +0900
commit: 4e603db3429957e6b26953c177f00a9c9d1c8766 (patch)
tree: 8206240e3006468bff9dfda5fb3696f80fbcb9f0 /admin
parent: b60f961f6cdc1095e778ad624657bb57788512af (diff)
parent: f6aa6ec68ed936800ef2c3aefa42102e60b654cb (diff)
download: emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.tar.gz
emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.zip
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 91a3640fff7..e7b0fbe4bf9 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -21,7 +21,7 @@
 EMACS = ../../src/emacs
 DSTDIR = ../../lisp/international
-RUNEMACS = ${EMACS} -Q --multibyte -batch
+RUNEMACS = ${EMACS} -Q -batch
 all: ${DSTDIR}/charprop.el ../../src/biditype.h ../../src/bidimirror.h
diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 85dfb135df8..58cea29db8b 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -27,7 +27,7 @@ lisp = $(CURDIR)/../../lisp
 # lisp/subdirs.el is not generated yet when the commands below run.
 EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
 # Quote EMACS so it could be a file name with embedded whitespace
-RUNEMACS = "$(EMACS)" -Q --multibyte -batch
+RUNEMACS = "$(EMACS)" -Q -batch
 all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h
author	Kenichi Handa	2010-08-25 14:15:20 +0900
committer	Kenichi Handa	2010-08-25 14:15:20 +0900
commit	4e603db3429957e6b26953c177f00a9c9d1c8766 (patch)
tree	8206240e3006468bff9dfda5fb3696f80fbcb9f0 /admin
parent	b60f961f6cdc1095e778ad624657bb57788512af (diff)
parent	f6aa6ec68ed936800ef2c3aefa42102e60b654cb (diff)
download	emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.tar.gz emacs-4e603db3429957e6b26953c177f00a9c9d1c8766.zip

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 91a3640fff7..e7b0fbe4bf9 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in
@@ -21,7 +21,7 @@
21		21
22	EMACS = ../../src/emacs	22	EMACS = ../../src/emacs
23	DSTDIR = ../../lisp/international	23	DSTDIR = ../../lisp/international
24	RUNEMACS = ${EMACS} -Q --multibyte -batch	24	RUNEMACS = ${EMACS} -Q -batch
25		25
26	all: ${DSTDIR}/charprop.el ../../src/biditype.h ../../src/bidimirror.h	26	all: ${DSTDIR}/charprop.el ../../src/biditype.h ../../src/bidimirror.h
27		27


diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in index 85dfb135df8..58cea29db8b 100644 --- a/admin/unidata/makefile.w32-in +++ b/admin/unidata/makefile.w32-in
@@ -27,7 +27,7 @@ lisp = $(CURDIR)/../../lisp
27	# lisp/subdirs.el is not generated yet when the commands below run.	27	# lisp/subdirs.el is not generated yet when the commands below run.
28	EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp	28	EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
29	# Quote EMACS so it could be a file name with embedded whitespace	29	# Quote EMACS so it could be a file name with embedded whitespace
30	RUNEMACS = "$(EMACS)" -Q --multibyte -batch	30	RUNEMACS = "$(EMACS)" -Q -batch
31		31
32	all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h	32	all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h
33		33