Commit 50efd41b authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents dfe3c90f 7d383292
autom4te.cache
makefile
*~
/README.W32
/bin/
/site-lisp/
......
2010-07-25 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Check for __executable_start.
2010-07-24 Ken Brown <kbrown@cornell.edu>
* configure.in (LINKER, LIB_GCC): Remove cygwin special cases (Bug#6715)
2010-07-24 Juanma Barranquero <lekktu@gmail.com>
* .bzrignore, .gitignore: Ignore README.W32 on the root directory.
2010-07-24 Ken Brown <kbrown@cornell.edu> (tiny change)
* configure.in (START_FILES) [cygwin]: Set to pre-crt0.o (Bug#6715).
2010-07-12 Andreas Schwab <schwab@linux-m68k.org>
* configure.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS)
......@@ -8373,7 +8389,7 @@
(EMACSROOT): New variable, giving the directory under which all of
Emacs's libraries should be installed. Changed rest of file to
use it.
(LIBDIR): Now denotes only architecture-dependent dir - relevant cha
(LIBDIR): Now denotes only architecture-dependent dir.
(DATADIR): New variable, denoting architecture-independent dir.
(LOCKDIR): New variable, for completeness.
(SUBDIR): No more etc, new lib-src.
......
2010-07-24 Christoph Scholtes <cschol2112@gmail.com>
* admin.el: Write version number to nt/makefile.w32-in.
* nt/makedist.bat: Remove; replaced with `zipdist.bat'
in the nt/ directory.
* nt/README.W32: Relocate to nt/ directory.
2010-07-11 Andreas Schwab <schwab@linux-m68k.org>
* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
......@@ -432,7 +439,7 @@
* charsets/mapconv: Handle UNICODE2.
* charsets/Makefile (CJK): Include CP932-2BYTE.map
* charsets/Makefile (CJK): Include CP932-2BYTE.map.
(CP932-2BYTE.map): New target.
2008-02-01 Kenichi Handa <handa@m17n.org>
......@@ -752,7 +759,7 @@
2004-08-28 Jan Djärv <jan.h.d@swipnet.se>
* FOR-RELEASE (Indications): Remove entry about GTK and geometry,
* FOR-RELEASE (Indications): Remove entry about GTK and geometry
(now behaves as well as other ports).
2004-06-28 Jan Djärv <jan.h.d@swipnet.se>
......
......@@ -95,6 +95,9 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "lib-src/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "nt/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space)
(submatch (1+ (in "0-9."))))))
;; nt/emacs.rc also contains the version number, but in an awkward
;; format. It must contain four components, separated by commas, and
;; in two places those commas are followed by space, in two other
......
@echo off
rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
rem Free Software Foundation, Inc.
rem Cannot use brackets in andrewi's email below because
rem older Windows shells will treat that as redirection.
rem Author: Andrew Innes andrewi@gnu.org
rem This file is part of GNU Emacs.
rem GNU Emacs is free software: you can redistribute it and/or modify
rem it under the terms of the GNU General Public License as published by
rem the Free Software Foundation, either version 3 of the License, or
rem (at your option) any later version.
rem GNU Emacs is distributed in the hope that it will be useful,
rem but WITHOUT ANY WARRANTY; without even the implied warranty of
rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
rem GNU General Public License for more details.
rem You should have received a copy of the GNU General Public License
rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
if (%3) == () goto usage
if not (%4) == () goto %4
:bin
echo Create full bin distribution
copy %3\README.W32 emacs-%1\README.W32
rem Info-ZIP zip seems to be broken on Windows.
rem It always writes to zip.zip and treats the zipfile argument as one
rem of the files to go in it.
rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS
7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
del emacs-%1\README.W32
if not (%4) == () goto end
:barebin
echo Create archive with just the basic binaries and generated files
echo (the user needs to unpack the full source distribution for
echo everything else)
copy %3\README.W32 emacs-%1\README.W32
rem Info-ZIP zip seems to be broken on Windows.
rem It always writes to zip.zip and treats the zipfile argument as one
rem of the files to go in it.
rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING
7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING
del emacs-%1\README.W32
if not (%4) == () goto end
goto end
:usage
echo Generate source and binary distributions of emacs.
echo Usage: %0 emacs-version dist-basename distfiles [bin,barebin]
echo (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)
:end
goto skipArchTag
arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68
:skipArchTag
......@@ -5885,7 +5885,7 @@ START_FILES=
case $opsys in
cygwin )
LIB_MATH=
START_FILES='ecrt0.o'
START_FILES='pre-crt0.o'
;;
darwin )
## Adding -lm confuses the dynamic linker, so omit it.
......@@ -11190,7 +11190,7 @@ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm strchr strrchr \
sendto recvfrom getsockopt setsockopt getsockname getpeername \
gai_strerror mkstemp getline getdelim mremap memmove fsync sync \
memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign \
cfmakeraw cfsetspeed isnan copysign
cfmakeraw cfsetspeed isnan copysign __executable_start
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
......@@ -14149,9 +14149,7 @@ LINKER=
ORDINARY_LINK=
case "$opsys" in
## gnu: GNU needs its own crt0.
aix4-2|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
cygwin) LINKER="\$(CC)" ;;
aix4-2|cygwin|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
## library search parth, i.e. it won't search /usr/lib for libc and
......@@ -14206,8 +14204,7 @@ LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
case "$opsys" in
## cygwin: don't link against static libgcc.
cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
freebsd|netbsd|openbsd) LIB_GCC= ;;
gnu-*)
## armin76@gentoo.org reported that the lgcc_s flag is necessary to
......
......@@ -1060,7 +1060,7 @@ START_FILES=
case $opsys in
cygwin )
LIB_MATH=
START_FILES='ecrt0.o'
START_FILES='pre-crt0.o'
;;
darwin )
## Adding -lm confuses the dynamic linker, so omit it.
......@@ -2611,7 +2611,7 @@ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm strchr strrchr \
sendto recvfrom getsockopt setsockopt getsockname getpeername \
gai_strerror mkstemp getline getdelim mremap memmove fsync sync \
memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign \
cfmakeraw cfsetspeed isnan copysign)
cfmakeraw cfsetspeed isnan copysign __executable_start)
AC_CHECK_HEADERS(sys/un.h)
......@@ -3326,9 +3326,7 @@ LINKER=
ORDINARY_LINK=
case "$opsys" in
## gnu: GNU needs its own crt0.
aix4-2|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
cygwin) LINKER="\$(CC)" ;;
aix4-2|cygwin|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
## library search parth, i.e. it won't search /usr/lib for libc and
......@@ -3381,8 +3379,7 @@ LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
case "$opsys" in
## cygwin: don't link against static libgcc.
cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
freebsd|netbsd|openbsd) LIB_GCC= ;;
gnu-*)
## armin76@gentoo.org reported that the lgcc_s flag is necessary to
......
......@@ -606,7 +606,7 @@
2009-06-23 Miles Bader <miles@gnu.org>
* display.texi (Scrolling): Document `recenter-redisplay'
* display.texi (Scrolling): Document `recenter-redisplay'.
(Temporary Face Changes): Document `text-scale-set'.
2009-06-21 Chong Yidong <cyd@stupidchicken.com>
......@@ -5704,7 +5704,7 @@
2005-03-05 Juri Linkov <juri@jurta.org>
* cmdargs.texi (Emacs Invocation): Add cindex
"invocation (command line arguments)"
"invocation (command line arguments)".
(Misc X): Add -nbc, --no-blinking-cursor.
2005-03-04 Ulf Jasper <ulf.jasper@web.de>
......
......@@ -212,7 +212,7 @@
(Simple Extension): Replace longer expression with
`emacs-major-version'. Remove comment about `number-to-string'
function.
(Miscellaneous): Add filename option, `-H', to `grep' example
(Miscellaneous): Add filename option, `-H', to `grep' example.
(debug, debug-on-entry): Replace `GNU Emacs 22' with `a recent
GNU Emacs'.
(edebug): More properly state where to place point for 'M-x
......@@ -234,7 +234,7 @@
(sentence-end): Specify `in English' for glyphs that end a sentence.
Note that in GNU Emacs 22, the name refers to both a variable and a
function.
(fwd-sentence while loops): Write a function as one, not as a form
(fwd-sentence while loops): Write a function as one, not as a form.
(fwd-para let): Add `which' to sentence with `parstart' and `parsep'.
(etags): Move sentences involving `find-tag' and sources. State
location of Emacs `src' directory.
......@@ -356,7 +356,7 @@
2003-11-16 Kevin Ryde <user42@zip.com.au>
* emacs-lisp-intro.texi: [CVS commitment by <bob@rattlesnake.com>]
Corrections to cross references,
Corrections to cross references.
(Interactive Options): elisp "interactive" -> "Using Interactive".
(defvar and asterisk): Remove emacs "Edit Options" reference,
edit-options is no longer described in the emacs manual.
......
......@@ -6015,7 +6015,7 @@
2005-02-05 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Color Names): Add pointer to the X docs about RGB
color specifications. Improve indexing
color specifications. Improve indexing.
(Text Terminal Colors): Replace the description of RGB values by
an xref to "Color Names".
......@@ -7778,7 +7778,7 @@
* minibuf.texi (Reading File Names): read-file-name has new
arg PREDICATE. New function read-directory-name.
* macros.texi (Defining Macros): Give definition of `declare'
* macros.texi (Defining Macros): Give definition of `declare'.
(Indenting Macros): New node.
* frames.texi (Parameter Access): Add modify-all-frames-parameters.
......@@ -7882,7 +7882,7 @@
* numbers.texi (Integer Basics): Add most-positive-fixnum,
most-negative-fixnum.
* compile.texi (Byte Compilation): Explain no-byte-compile
* compile.texi (Byte Compilation): Explain no-byte-compile.
(Compiler Errors): New node.
* os.texi (User Identification): user-uid, user-real-uid
......
......@@ -4777,7 +4777,7 @@
* org.texi (FAQ): Document `org-table-tab-jumps-over-hlines'.
(Agenda): Document commands `org-cycle-agenda-files' and
`org-agenda-file-to-front'
`org-agenda-file-to-front'.
(Built-in table editor): Document `org-table-sort-lines'.
(HTML formatting): Export of hand-formatted lists.
......@@ -6366,7 +6366,7 @@
2000-12-14 Dave Love <fx@gnu.org>
* Makefile.in (mostlyclean): Remove gnustmp.*
* Makefile.in (mostlyclean): Remove gnustmp.*.
(gnus.dvi): Change rule to remove @latex stuff.
2000-10-19 Eric M. Ludlam <zappo@ultranet.com>
......
2010-07-24 Christoph Scholtes <cschol2112@gmail.com>
* NEWS: Document new --distfiles configure.bat option and
`dist' make target on Windows.
2010-07-20 Juanma Barranquero <lekktu@gmail.com>
* PROBLEMS: Add note about use of backslashes in Windows paths.
......@@ -4941,7 +4946,7 @@
* etags.c: Changes for VMS.
Always define ETAGS on VMS.
Define macros GOOD and BAD for success and failure exit codes.
(begtk, intk): Allow `$' in identifiers
(begtk, intk): Allow `$' in identifiers.
(main): Don't support -B, -F or -u on VMS.
Alternate loop for scanning filename arguments.
(system): Delete definition of this function.
......
......@@ -432,6 +432,12 @@ displayed with a "spinning bar".
** New configure.bat option --enable-checking builds emacs with extra
runtime checks.
** New configure.bat option --distfiles to specify files to be
included in binary distribution
** New make target `dist' to create binary disttribution for Windows
platform
----------------------------------------------------------------------
This file is part of GNU Emacs.
......
......@@ -1189,7 +1189,7 @@
2001-03-31 Kenichi Handa <handa@etl.go.jp>
* Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc
* Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc.
(NON-TIT-BIG5): Delete ${srcdir}/quail/quick-b5.elc
${srcdir}/quail/tsang-b5.elc.
(CHINESE-NON-TIT): Delete ${NON-TIT-CNS}.
......
2010-07-25 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (getcwd): Fix previous change: make getcwd
conditional on HAVE_GETCWD and declare with the correct POSIX
profile (for some reason MinGW headers define its 2nd arg as int,
not size_t; but getcwd is not used on Windows nonetheless).
2010-07-25 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (getcwd, w32_getenv):
* ntlib.h (getlogin, getuid, getegid, getgid): Fix prototypes.
2010-07-24 Dan Nicolaescu <dann@ics.uci.edu>
* update-game-score.c (usage): Add NO_RETURN specifier.
* movemail.c (fatal, pfatal_with_name, pfatal_and_delete):
* make-docfile.c (fatal):
* hexl.c (usage):
* fakemail.c (fatal):
* etags.c (fatal, suggest_asking_for_help, pfatal):
* emacsclient.c (fatal):
* b2m.c (fatal): Likewise.
2010-07-23 Juanma Barranquero <lekktu@gmail.com>
* make-docfile.c (write_c_args): Correctly handle prefixes of "defalt".
2010-07-20 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (get_current_dir_name, w32_get_resource)
......@@ -775,7 +802,7 @@
2008-02-01 Jason Rumney <jasonr@gnu.org>
* makefile.w32-in (obj): Sync with src/Makefile.in
* makefile.w32-in (obj): Sync with src/Makefile.in.
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.
(WINNT_SUPPORT): Add term/w32-win.elc.
(lisp1, lisp2): Sync with lisp in src/Makefile.in.
......@@ -2471,7 +2498,7 @@
* makefile.w32-in (WINNT_SUPPORT, MOUSE_SUPPORT, lisp): Revert to
using .elc files.
(lisp): Sync with list in src/Makefile.in
(lisp): Sync with list in src/Makefile.in.
(VMS_SUPPORT, MSDOS_SUPPORT): Define, so DOC files can be shared.
2002-02-10 Paul Eggert <eggert@twinsun.com>
......@@ -6313,7 +6340,7 @@
(TOKEN): Member linestart removed.
(linepos, prev_linepos, lb1): Deleted.
(main): Call initbuffer on lbs array instead of lb1.
(init): Removed the initialisation of the logical _gd array;
(init): Removed the initialisation of the logical _gd array.
(find_entries): A .sa suffix means assembler file.
(C_create_stab): "auto", "void", "extern", "static" are st_C_typespec.
All C state machines rewritten.
......@@ -7177,7 +7204,7 @@
* etags.c: Changes for VMS.
Always define ETAGS on VMS.
Define macros GOOD and BAD for success and failure exit codes.
(begtk, intk): Allow `$' in identifiers
(begtk, intk): Allow `$' in identifiers.
(main): Don't support -B, -F or -u on VMS.
Alternate loop for scanning filename arguments.
(system): Delete definition of this function.
......
......@@ -70,7 +70,7 @@ long *xmalloc (unsigned int size);
long *xrealloc (char *ptr, unsigned int size);
char *concat (char *s1, char *s2, char *s3);
long readline (struct linebuffer *linebuffer, register FILE *stream);
void fatal (char *message);
void fatal (char *message) NO_RETURN;
/*
* xnew -- allocate storage. SYNOPSIS: Type *xnew (int n, Type);
......
......@@ -82,10 +82,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
char *getenv (const char *), *getwd (char *);
char *(getcwd) ();
#ifdef HAVE_GETCWD
char *(getcwd) (char *, size_t);
#endif
#ifdef WINDOWSNT
char *w32_getenv ();
char *w32_getenv (char *);
#define egetenv(VAR) w32_getenv(VAR)
#else
#define egetenv(VAR) getenv(VAR)
......@@ -158,6 +160,8 @@ char *server_file = NULL;
int emacs_pid = 0;
void print_help_and_exit (void) NO_RETURN;
void fail (void) NO_RETURN;
struct option longopts[] =
{
......@@ -400,7 +404,7 @@ w32_set_user_model_id (void)
/* On Windows 7 and later, we need to set the user model ID
to associate emacsclient launched files with Emacs frames
in the UI. */
shell = LoadLibrary("shell32.dll");
shell = LoadLibrary ("shell32.dll");
if (shell)
{
set_user_model
......@@ -430,7 +434,7 @@ w32_window_app (void)
nonconsole apps. Testing for the console title seems to work. */
window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
if (window_app)
InitCommonControls();
InitCommonControls ();
}
return window_app;
......@@ -481,7 +485,7 @@ ttyname (int fd)
void
message (int is_error, char *message, ...)
{
char msg [2048];
char msg[2048];
va_list args;
va_start (args, message);
......@@ -1468,7 +1472,7 @@ start_daemon_and_retry_set_socket (void)
pid_t w;
w = waitpid (dpid, &status, WUNTRACED | WCONTINUED);
if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS(status))
if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status))
{
message (TRUE, "Error: Could not start the Emacs daemon\n");
exit (EXIT_FAILURE);
......
......@@ -406,9 +406,9 @@ static void analyse_regex (char *);
static void free_regexps (void);
static void regex_tag_multiline (void);
static void error (const char *, const char *);
static void suggest_asking_for_help (void);
void fatal (char *, char *);
static void pfatal (char *);
static void suggest_asking_for_help (void) NO_RETURN;
void fatal (char *, char *) NO_RETURN;
static void pfatal (char *) NO_RETURN;
static void add_node (node *, node **);
static void init (void);
......
......@@ -147,6 +147,8 @@ static line_list file_preface;
static stream_list the_streams;
static boolean no_problems = true;
static void fatal (char *s1) NO_RETURN;
extern FILE *popen (const char *, const char *);
extern int fclose (FILE *), pclose (FILE *);
......
......@@ -49,7 +49,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
int group_by = DEFAULT_GROUPING;
char *progname;
void usage(void);
void usage(void) NO_RETURN;
int
main (int argc, char **argv)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment