Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100906. ------------------------------------------------------------ revno: 100906 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-07-25 23:37:26 -0700 message: Mark functions as NO_RETURN. * src/lisp.h (Ftop_level, Fexit_recursive_edit) (Fabort_recursive_edit): Mark as NO_RETURN. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-26 04:29:08 +0000 +++ src/ChangeLog 2010-07-26 06:37:26 +0000 @@ -1,3 +1,8 @@ +2010-07-26 Dan Nicolaescu + + * lisp.h (Ftop_level, Fexit_recursive_edit) + (Fabort_recursive_edit): Mark as NO_RETURN. + 2010-07-26 Kenichi Handa * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the === modified file 'src/lisp.h' --- src/lisp.h 2010-07-24 18:15:40 +0000 +++ src/lisp.h 2010-07-26 06:37:26 +0000 @@ -3155,7 +3155,9 @@ extern int input_pending; EXFUN (Fdiscard_input, 0); EXFUN (Frecursive_edit, 0); -EXFUN (Ftop_level, 0); +EXFUN (Ftop_level, 0) NO_RETURN; +EXFUN (Fexit_recursive_edit, 0) NO_RETURN; +EXFUN (Fabort_recursive_edit, 0) NO_RETURN; EXFUN (Fcommand_execute, 4); EXFUN (Finput_pending_p, 0); extern Lisp_Object menu_bar_items (Lisp_Object); ------------------------------------------------------------ revno: 100905 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-07-25 23:22:32 -0700 message: * lwlib/xlwmenu.h (xlwmenu_window_p, xlwmenu_redisplay): Add declarations. diff: === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2010-07-24 11:53:19 +0000 +++ lwlib/ChangeLog 2010-07-26 06:22:32 +0000 @@ -1,3 +1,7 @@ +2010-07-26 Dan Nicolaescu + + * xlwmenu.h (xlwmenu_window_p, xlwmenu_redisplay): Add declarations. + 2010-07-12 Andreas Schwab * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from === modified file 'lwlib/xlwmenu.h' --- lwlib/xlwmenu.h 2010-04-08 16:20:32 +0000 +++ lwlib/xlwmenu.h 2010-07-26 06:22:32 +0000 @@ -81,6 +81,9 @@ extern WidgetClass xlwMenuWidgetClass; +extern int xlwmenu_window_p (Widget w, Window window); +extern void xlwmenu_redisplay (Widget); + #endif /* _XlwMenu_h */ /* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07 ------------------------------------------------------------ revno: 100904 committer: Daiki Ueno branch nick: trunk timestamp: Mon 2010-07-26 14:22:13 +0900 message: Add alternative key bindings to epa-mail.el. * epa-mail.el (epa-mail-mode-map): Add alternative key bindings which consist of control chars only. Suggested by Richard Stallman. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-25 11:50:51 +0000 +++ lisp/ChangeLog 2010-07-26 05:22:13 +0000 @@ -1,3 +1,9 @@ +2010-07-26 Daiki Ueno + + * epa-mail.el (epa-mail-mode-map): Add alternative key bindings + which consist of control chars only. Suggested by Richard + Stallman. + 2010-07-25 Daiki Ueno * epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE === modified file 'lisp/epa-mail.el' --- lisp/epa-mail.el 2010-01-13 08:35:10 +0000 +++ lisp/epa-mail.el 2010-07-26 05:22:13 +0000 @@ -32,6 +32,12 @@ (define-key keymap "\C-c\C-ee" 'epa-mail-encrypt) (define-key keymap "\C-c\C-ei" 'epa-mail-import-keys) (define-key keymap "\C-c\C-eo" 'epa-insert-keys) + (define-key keymap "\C-c\C-e\C-d" 'epa-mail-decrypt) + (define-key keymap "\C-c\C-e\C-v" 'epa-mail-verify) + (define-key keymap "\C-c\C-e\C-s" 'epa-mail-sign) + (define-key keymap "\C-c\C-e\C-e" 'epa-mail-encrypt) + (define-key keymap "\C-c\C-e\C-i" 'epa-mail-import-keys) + (define-key keymap "\C-c\C-e\C-o" 'epa-insert-keys) keymap)) (defvar epa-mail-mode-hook nil) ------------------------------------------------------------ revno: 100903 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-07-26 13:30:05 +0900 message: font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of glyphs gets smaller than the original length. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-26 00:43:58 +0000 +++ src/ChangeLog 2010-07-26 04:29:08 +0000 @@ -1,3 +1,8 @@ +2010-07-26 Kenichi Handa + + * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the + number of glyphs gets smaller than the original length. + 2010-07-26 Juanma Barranquero * lread.c (unreadpure, mapatoms_1): Make static. === modified file 'src/font.c' --- src/font.c 2010-07-23 17:50:14 +0000 +++ src/font.c 2010-07-26 04:29:08 +0000 @@ -4459,6 +4459,8 @@ } if (i == 3 || XINT (n) == 0) return Qnil; + if (XINT (n) < LGSTRING_GLYPH_LEN (gstring)) + LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil); glyph = LGSTRING_GLYPH (gstring, 0); from = LGLYPH_FROM (glyph); ------------------------------------------------------------ revno: 100902 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2010-07-26 02:43:58 +0200 message: * lread.c (unreadpure, mapatoms_1): Make static. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 19:30:14 +0000 +++ src/ChangeLog 2010-07-26 00:43:58 +0000 @@ -1,3 +1,7 @@ +2010-07-26 Juanma Barranquero + + * lread.c (unreadpure, mapatoms_1): Make static. + 2010-07-25 Juanma Barranquero * terminfo.c (tparam): Fix prototype of tparm. === modified file 'src/lread.c' --- src/lread.c 2010-07-12 17:47:17 +0000 +++ src/lread.c 2010-07-26 00:43:58 +0000 @@ -1276,7 +1276,6 @@ static Lisp_Object load_unwind (Lisp_Object arg) /* used as unwind-protect function in load */ - { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; if (stream != NULL) @@ -1567,9 +1566,8 @@ Vload_history); } -Lisp_Object +static Lisp_Object unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */ - { read_pure = 0; return Qnil; @@ -3818,7 +3816,7 @@ } } -void +static void mapatoms_1 (Lisp_Object sym, Lisp_Object function) { call1 (function, sym); ------------------------------------------------------------ revno: 100901 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-07-25 21:30:14 +0200 message: * terminfo.c (tparam): Fix prototype of tparm (followup to revno:100891). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 19:09:54 +0000 +++ src/ChangeLog 2010-07-25 19:30:14 +0000 @@ -1,3 +1,7 @@ +2010-07-25 Juanma Barranquero + + * terminfo.c (tparam): Fix prototype of tparm. + 2010-07-25 Andreas Schwab * emacs.c (main) [PROFILING]: Use __executable_start if defined to === modified file 'src/terminfo.c' --- src/terminfo.c 2010-07-04 07:50:25 +0000 +++ src/terminfo.c 2010-07-25 19:30:14 +0000 @@ -35,10 +35,12 @@ */ char * -tparam (char *string, char *outstring, int len, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) +tparam (char *string, char *outstring, + int len, int arg1, int arg2, int arg3, int arg4, + int arg5, int arg6, int arg7, int arg8, int arg9) { char *temp; - extern char *tparm(/* ??? */); + extern char *tparm (char *str, ...); temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); if (outstring == 0) ------------------------------------------------------------ revno: 100900 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2010-07-25 21:09:54 +0200 message: Use __executable_start to find start of text segment for profiling * emacs.c (main) [PROFILING]: Use __executable_start if defined to find start of text segment. * dispnew.c (safe_bcopy): Don't define if HAVE___EXECUTABLE_START is defined. * configure.in: Check for __executable_start. diff: === modified file 'ChangeLog' --- ChangeLog 2010-07-24 18:44:54 +0000 +++ ChangeLog 2010-07-25 19:09:54 +0000 @@ -1,3 +1,7 @@ +2010-07-25 Andreas Schwab + + * configure.in: Check for __executable_start. + 2010-07-24 Ken Brown * configure.in (LINKER, LIB_GCC): Remove cygwin special cases (Bug#6715) === modified file 'configure' --- configure 2010-07-24 22:06:03 +0000 +++ configure 2010-07-25 19:09:54 +0000 @@ -11190,7 +11190,7 @@ 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" === modified file 'configure.in' --- configure.in 2010-07-24 18:44:54 +0000 +++ configure.in 2010-07-25 19:09:54 +0000 @@ -2611,7 +2611,7 @@ 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) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 18:36:37 +0000 +++ src/ChangeLog 2010-07-25 19:09:54 +0000 @@ -1,5 +1,10 @@ 2010-07-25 Andreas Schwab + * emacs.c (main) [PROFILING]: Use __executable_start if defined to + find start of text segment. + * dispnew.c (safe_bcopy): Don't define if HAVE___EXECUTABLE_START + is defined. + * callproc.c (set_initial_environment): Avoid unbalanced braces. 2010-07-25 Ken Brown === modified file 'src/config.in' --- src/config.in 2010-07-11 10:31:10 +0000 +++ src/config.in 2010-07-25 19:09:54 +0000 @@ -801,6 +801,9 @@ /* Define to 1 if you want to use the X window system. */ #undef HAVE_X_WINDOWS +/* Define to 1 if you have the `__executable_start' function. */ +#undef HAVE___EXECUTABLE_START + /* Define to 1 if you have the `__fpending' function. */ #undef HAVE___FPENDING === modified file 'src/dispnew.c' --- src/dispnew.c 2010-07-12 16:32:53 +0000 +++ src/dispnew.c 2010-07-25 19:09:54 +0000 @@ -436,7 +436,7 @@ #endif /* GLYPH_DEBUG == 0 */ -#ifdef PROFILING +#if defined PROFILING && !HAVE___EXECUTABLE_START /* FIXME: only used to find text start for profiling. */ void === modified file 'src/emacs.c' --- src/emacs.c 2010-07-13 10:57:00 +0000 +++ src/emacs.c 2010-07-25 19:09:54 +0000 @@ -1747,9 +1747,18 @@ #else extern char etext; #endif +#ifdef HAVE___EXECUTABLE_START + /* This symbol is defined by GNU ld to the start of the text + segment. */ + extern char __executable_start[]; +#else extern void safe_bcopy (); +#endif atexit (_mcleanup); +#ifdef HAVE___EXECUTABLE_START + monstartup (__executable_start, &etext); +#else /* This uses safe_bcopy because that function comes first in the Emacs executable. It might be better to use something that gives the start of the text segment, but start_of_text is not @@ -1757,6 +1766,7 @@ /* FIXME: Does not work on architectures with function descriptors. */ monstartup (safe_bcopy, &etext); +#endif } else moncontrol (0); ------------------------------------------------------------ revno: 100899 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2010-07-25 20:36:37 +0200 message: * callproc.c (set_initial_environment): Avoid unbalanced braces. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 14:13:30 +0000 +++ src/ChangeLog 2010-07-25 18:36:37 +0000 @@ -1,3 +1,7 @@ +2010-07-25 Andreas Schwab + + * callproc.c (set_initial_environment): Avoid unbalanced braces. + 2010-07-25 Ken Brown * vm-limit.c (check_memory_limits): Fix previous change; === modified file 'src/callproc.c' --- src/callproc.c 2010-07-25 00:20:51 +0000 +++ src/callproc.c 2010-07-25 18:36:37 +0000 @@ -1530,13 +1530,12 @@ set_initial_environment (void) { register char **envp; -#ifndef CANNOT_DUMP +#ifdef CANNOT_DUMP + Vprocess_environment = Qnil; +#else if (initialized) - { -#else - { - Vprocess_environment = Qnil; #endif + { for (envp = environ; *envp; envp++) Vprocess_environment = Fcons (build_string (*envp), Vprocess_environment); ------------------------------------------------------------ revno: 100898 committer: Ken Brown branch nick: trunk timestamp: Sun 2010-07-25 10:13:30 -0400 message: * vm-limit.c (check_memory_limits): Fix previous change; accidentally reverted an earlier change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 13:46:48 +0000 +++ src/ChangeLog 2010-07-25 14:13:30 +0000 @@ -1,5 +1,10 @@ 2010-07-25 Ken Brown + * vm-limit.c (check_memory_limits): Fix previous change; + accidentally reverted an earlier change. + +2010-07-25 Ken Brown + * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715). === modified file 'src/vm-limit.c' --- src/vm-limit.c 2010-07-25 13:46:48 +0000 +++ src/vm-limit.c 2010-07-25 14:13:30 +0000 @@ -173,9 +173,9 @@ check_memory_limits (void) { #ifdef REL_ALLOC - extern POINTER (*real_morecore) (); + extern POINTER (*real_morecore) (SIZE); #endif - extern POINTER (*__morecore) (); + extern POINTER (*__morecore) (SIZE); register POINTER cp; unsigned long five_percent; ------------------------------------------------------------ revno: 100897 committer: Ken Brown branch nick: trunk timestamp: Sun 2010-07-25 09:46:48 -0400 message: Cygwin build cleanup (Bug#6715). * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... * vm-limit.c: ...add 'defined (CYGWIN)' here. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-25 00:20:51 +0000 +++ src/ChangeLog 2010-07-25 13:46:48 +0000 @@ -1,3 +1,8 @@ +2010-07-25 Ken Brown + + * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead... + * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715). + 2010-07-25 Juanma Barranquero * callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT. === modified file 'src/mem-limits.h' --- src/mem-limits.h 2010-07-08 03:03:52 +0000 +++ src/mem-limits.h 2010-07-25 13:46:48 +0000 @@ -34,10 +34,6 @@ # endif #endif -#ifdef CYGWIN -#define BSD4_2 -#endif - #ifdef BSD4_2 #include #include === modified file 'src/vm-limit.c' --- src/vm-limit.c 2010-07-25 00:20:51 +0000 +++ src/vm-limit.c 2010-07-25 13:46:48 +0000 @@ -100,7 +100,7 @@ } #else -#if !defined (BSD4_2) && !defined (__osf__) +#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN) #ifdef MSDOS void @@ -173,9 +173,9 @@ check_memory_limits (void) { #ifdef REL_ALLOC - extern POINTER (*real_morecore) (SIZE); + extern POINTER (*real_morecore) (); #endif - extern POINTER (*__morecore) (SIZE); + extern POINTER (*__morecore) (); register POINTER cp; unsigned long five_percent; ------------------------------------------------------------ revno: 100896 committer: Daiki Ueno branch nick: trunk timestamp: Sun 2010-07-25 20:50:51 +0900 message: Fix typo and comment. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-25 11:23:43 +0000 +++ lisp/ChangeLog 2010-07-25 11:50:51 +0000 @@ -353,7 +353,7 @@ * epa-file.el (epa-file-error, epa-file--find-file-not-found-function) (epa-file-insert-file-contents): Hack to prevent - find-file from opening empty buffer when decryptin failed + find-file from opening empty buffer when decryption failed (bug#6568). 2010-07-07 Agustín Martín === modified file 'lisp/epa-file.el' --- lisp/epa-file.el 2010-07-25 11:23:43 +0000 +++ lisp/epa-file.el 2010-07-25 11:50:51 +0000 @@ -139,11 +139,11 @@ (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil)) + ;; Hack to prevent find-file from opening empty buffer + ;; when decryption failed (bug#6568). See the place + ;; where `find-file-not-found-functions' are called in + ;; `find-file-noselect-1'. (when (file-exists-p local-file) - ;; Hack to prevent find-file from opening empty buffer - ;; when decryption failed (bug#6568). See the place - ;; where `find-file-not-found-functions' are called in - ;; `find-file-noselect-1'. (make-local-variable 'epa-file-error) (setq epa-file-error error) (add-hook 'find-file-not-found-functions ------------------------------------------------------------ revno: 100895 committer: Daiki Ueno branch nick: trunk timestamp: Sun 2010-07-25 20:23:43 +0900 message: Fix *.gpg file creation (bug#6723). * epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE exists before passing an error to find-file-not-found-functions (bug#6723). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-24 11:53:19 +0000 +++ lisp/ChangeLog 2010-07-25 11:23:43 +0000 @@ -1,3 +1,9 @@ +2010-07-25 Daiki Ueno + + * epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE + exists before passing an error to find-file-not-found-functions + (bug#6723). + 2010-07-23 Lukas Huonker * play/tetris.el (tetris-tty-colors, tetris-x-colors, tetris-blank): === modified file 'lisp/epa-file.el' --- lisp/epa-file.el 2010-07-08 01:02:24 +0000 +++ lisp/epa-file.el 2010-07-25 11:23:43 +0000 @@ -139,15 +139,16 @@ (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil)) - ;; Hack to prevent find-file from opening empty buffer - ;; when decryption failed (bug#6568). See the place - ;; where `find-file-not-found-functions' are called in - ;; `find-file-noselect-1'. - (make-local-variable 'epa-file-error) - (setq epa-file-error error) - (add-hook 'find-file-not-found-functions - 'epa-file--find-file-not-found-function - nil t) + (when (file-exists-p local-file) + ;; Hack to prevent find-file from opening empty buffer + ;; when decryption failed (bug#6568). See the place + ;; where `find-file-not-found-functions' are called in + ;; `find-file-noselect-1'. + (make-local-variable 'epa-file-error) + (setq epa-file-error error) + (add-hook 'find-file-not-found-functions + 'epa-file--find-file-not-found-function + nil t)) (signal 'file-error (cons "Opening input file" (cdr error))))) (make-local-variable 'epa-file-encrypt-to) ------------------------------------------------------------ revno: 100894 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-07-25 10:30:57 +0000 message: Accept x-pkcs7-signature MIME type as signature. 2010-07-24 David Engster * mml-smime.el (mml-smime-epg-verify): Also accept the older x-pkcs7-signature MIME type as signature (RFC 2311, C.1). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-07-24 11:53:19 +0000 +++ lisp/gnus/ChangeLog 2010-07-25 10:29:49 +0000 @@ -1,3 +1,8 @@ +2010-07-24 David Engster + + * mml-smime.el (mml-smime-epg-verify): Also accept the older + x-pkcs7-signature MIME type as signature (RFC 2311, C.1). + 2010-07-21 Daiki Ueno * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>" === modified file 'lisp/gnus/mml-smime.el' --- lisp/gnus/mml-smime.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/mml-smime.el 2010-07-25 10:29:49 +0000 @@ -520,10 +520,14 @@ ctl 'protocol) "application/pkcs7-signature") t))) - (null (setq signature (mm-find-part-by-type - (cdr handle) - "application/pkcs7-signature" - nil t)))) + (null (setq signature (or (mm-find-part-by-type + (cdr handle) + "application/pkcs7-signature" + nil t) + (mm-find-part-by-type + (cdr handle) + "application/x-pkcs7-signature" + nil t))))) (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "Corrupted") (throw 'error handle)) ------------------------------------------------------------ revno: 100893 [merge] author: Christoph Scholtes committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-07-25 05:53:37 +0200 message: Build binary distros on Windows using emacs-VERSION as root dir name. * nt/makefile.w32-in: Copy README.W32 to installation directory during `make install'. Remove README.W32 with `distclean' (in case Emacs was installed in place). Use temporary directory to create distribution zip files in `dist' target. * nt/zipdist.bat: Simplify code using temporary directory. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-07-25 00:20:51 +0000 +++ nt/ChangeLog 2010-07-25 03:53:37 +0000 @@ -1,3 +1,13 @@ +2010-07-25 Christoph Scholtes + + Build binary distros on Windows using emacs-VERSION as root dir name. + + * makefile.w32-in: Copy README.W32 to installation directory + during `make install'. Remove README.W32 with `distclean' (in + case Emacs was installed in place). Use temporary directory to + create distribution zip files in `dist' target. + * zipdist.bat: Simplify code using temporary directory. + 2010-07-25 Juanma Barranquero * runemacs.c (set_user_model_id): Fix prototype. === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2010-07-24 13:35:31 +0000 +++ nt/makefile.w32-in 2010-07-25 03:07:15 +0000 @@ -25,6 +25,8 @@ VERSION = 24.0.50 +TMP_DIST_DIR = emacs-$(VERSION) + TRES = $(BLD)/emacs.res CLIENTRES = $(BLD)/emacsclient.res @@ -208,6 +210,7 @@ - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin + - $(CP) README.W32 $(INSTALL_DIR) - $(DEL) ../same-dir.tst - $(DEL) $(INSTALL_DIR)/same-dir.tst echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" @@ -246,10 +249,22 @@ install-shortcuts: "$(INSTALL_DIR)/bin/addpm" -q -dist: install-bin - $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin - $(CP) README.W32 $(INSTALL_DIR) - $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE) +dist: install-bin + mkdir $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR) + $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin + $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) + $(DEL_TREE) $(TMP_DIST_DIR) force-info: # Note that doc/emacs/makefile knows how to @@ -336,6 +351,7 @@ - $(DEL) stamp_BLD - $(DEL) ../etc/DOC ../etc/DOC-X - $(DEL) config.log Makefile + - $(DEL) ../README.W32 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean === modified file 'nt/zipdist.bat' --- nt/zipdist.bat 2010-07-24 13:35:31 +0000 +++ nt/zipdist.bat 2010-07-24 22:04:10 +0000 @@ -20,25 +20,10 @@ rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/. SETLOCAL -rem arg 1: full path to Emacs root directory -set ARG_PATH="%~f1" -rem Path separator cannot be parsed correctly, substitute -set ARG_PATH=%ARG_PATH:\=;% - -rem arg 2: Emacs version number -set EMACS_VER=%2 - -rem Parse out last directory from passed in full path (arg 1) -for /f "tokens=* delims=;" %%G in (%ARG_PATH%) do call :PARSE_PATH %%G -goto :EXIT - -:PARSE_PATH -if "%1"=="" ( - goto :ZIP_CHECK -) -set ROOT_DIR=%1 -SHIFT -goto :PARSE_PATH +rem arg 1: Emacs version number +set EMACS_VER=%1 + +set TMP_DIST_DIR=emacs-%EMACS_VER% rem Check, if 7zip is installed and available on path :ZIP_CHECK @@ -53,14 +38,12 @@ rem Build distributions :ZIP_DIST -pushd ..\.. rem Build and verify full distribution -7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %ROOT_DIR%/BUGS %ROOT_DIR%/COPYING %ROOT_DIR%/README %ROOT_DIR%/README.W32 %ROOT_DIR%/INSTALL %ROOT_DIR%/bin %ROOT_DIR%/etc %ROOT_DIR%/info %ROOT_DIR%/lisp %ROOT_DIR%/leim %ROOT_DIR%/site-lisp +7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR% 7z t emacs-%EMACS_VER%-bin-i386.zip rem Build and verify binary only distribution -7z a -bd -tZIP -mx=9 emacs-%EMACS_VER%-barebin-i386.zip %ROOT_DIR%/README.W32 %ROOT_DIR%/bin %ROOT_DIR%/etc/DOC-X %ROOT_DIR%/COPYING +7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-barebin-i386.zip %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_DIR%/COPYING 7z t emacs-%EMACS_VER%-barebin-i386.zip -popd goto EXIT :EXIT ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.