Mercurial > hg > xemacs-beta
changeset 4977:2bf7c51d7101
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 04:28:08 -0600 |
| parents | 16112448d484 (current diff) 3bf1b0f0c391 (diff) |
| children | f48bf636045f |
| files | src/ChangeLog src/emacs.c |
| diffstat | 3 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Feb 04 07:28:14 2010 -0600 +++ b/src/ChangeLog Fri Feb 05 04:28:08 2010 -0600 @@ -229,6 +229,17 @@ 2010-02-04 Ben Wing <ben@xemacs.org> + * emacs.c (SHEBANG_EXE_PROGNAME_LENGTH): + * emacs.c (main_1): + Restore old definition of SHEBANG_EXE_PROGNAME_LENGTH; not possible + to ANSI-concatenate wide and narrow strings. + * print.c (write_msg_istring): + * print.c (write_msg_cistring): + * print.c (write_msg_ascstring): + Can't return a value in a void-declared function. + +2010-02-04 Ben Wing <ben@xemacs.org> + * filelock.c: * filelock.c (fill_in_lock_file_name): Name the lock symlink file .#FN# instead of .#FN for file FN, so
--- a/src/emacs.c Thu Feb 04 07:28:14 2010 -0600 +++ b/src/emacs.c Fri Feb 05 04:28:08 2010 -0600 @@ -937,7 +937,7 @@ #define SHEBANG_PROGNAME_LENGTH \ (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING ("")))) #define SHEBANG_EXE_PROGNAME_LENGTH \ - (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME ".exe")) \ + (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING (".exe")) \ - sizeof (WEXTSTRING (""))) {
--- a/src/print.c Thu Feb 04 07:28:14 2010 -0600 +++ b/src/print.c Fri Feb 05 04:28:08 2010 -0600 @@ -680,14 +680,14 @@ write_msg_istring (Lisp_Object stream, const Ibyte *str) { /* This function can GC */ - return write_istring (stream, IGETTEXT (str)); + write_istring (stream, IGETTEXT (str)); } void write_msg_cistring (Lisp_Object stream, const CIbyte *str) { /* This function can GC */ - return write_msg_istring (stream, (const Ibyte *) str); + write_msg_istring (stream, (const Ibyte *) str); } void @@ -695,7 +695,7 @@ { /* This function can GC */ ASSERT_ASCTEXT_ASCII (str); - return write_msg_istring (stream, (const Ibyte *) str); + write_msg_istring (stream, (const Ibyte *) str); } void