June 2006 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] Update man page for init file, one nroff format error 17 years, 3 months

Shyamal Prasad

etc/ChangeLog addition: 2004-12-03 Shyamal Prasad <shyamal(a)member.fsf.org> * xemacs.1: Now describe $HOME/.xemacs/init.el as the preferred init file. Fixed excessive space insertion in the description of the '-vanilla' option XEmacs source patch: Diff command: cvs -q diff -u Files affected: etc/xemacs.1 Index: etc/xemacs.1 =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/xemacs.1,v retrieving revision 1.13 diff -u -r1.13 xemacs.1 --- etc/xemacs.1 2001/04/12 18:20:52 1.13 +++ etc/xemacs.1 2004/12/04 01:33:45 ＠＠ -147,12 +147,7 ＠＠ .TP .B \-vanilla Load no extra files at startup. Equivalent to the combination of -.B \-q -, -.B \-no-site-file -, and -.B \-no-early-packages -\. +.BR \-q ", " \-no-site-file ", and " \-no-early-packages . .TP .BI \-u " user, " \-user " user" Load ＠＠ -628,7 +623,8 ＠＠ META-left Make a rectangular selection. .SH FILES Lisp code is read at startup from the user's init file, -\fB$HOME/.emacs\fP. +\fB$HOME/.xemacs/init.el\fP. If this file does not exist then +\fB$HOME/.emacs\fP will be read if it is present. /usr/local/info - files for the Info documentation browser (a subsystem of

2 participants
1 comments

[PATCH] Synch up format-time-string % specifiers with Emacs 21.3.1 17 years, 3 months

Shyamal Prasad

This patch adds % specifiers to format-time-string that are missing in XEmacs but supported by Emacs 21.3.1 src/ChangeLog addition: 2004-12-08 Shyamal Prasad <shyamal(a)member.fsf.org> * editfns.c: * editfns.c (Fformat_time_string): Added documentation for %z, %g, %G and %V specifiers. This synchs up the set of % specifiers for format-time-string with Emacs 21.3.1. Make copy of static buffer returned by localtime(). * strftime.c: * strftime.c (strftime): Implemented %z, %g, %G and %V in a style similar to existing implementation of other specifiers. XEmacs source patch: Diff command: cvs -q diff -u Files affected: src/strftime.c src/editfns.c Index: src/editfns.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/editfns.c,v retrieving revision 1.51 diff -u -r1.51 editfns.c --- src/editfns.c 2004/12/06 03:52:03 1.51 +++ src/editfns.c 2004/12/09 02:40:17 ＠＠ -1015,6 +1015,8 ＠＠ %d is replaced by the day of month, zero-padded. %D is a synonym for "%m/%d/%y". %e is replaced by the day of month, blank-padded. +%G is replaced by the year containing the ISO 8601 week +%g is replaced by the year of the ISO 8601 week within the century (00-99) %h is a synonym for "%b". %H is replaced by the hour (00-23). %I is replaced by the hour (00-12). ＠＠ -1033,12 +1035,14 ＠＠ %t is a synonym for "\\t". %T is a synonym for "%H:%M:%S". %U is replaced by the week of the year (00-53), first day of week is Sunday. +%V is replaced by the ISO 8601 week number %w is replaced by the day of week (0-6), Sunday is day 0. %W is replaced by the week of the year (00-53), first day of week is Monday. %x is a locale-specific synonym, which defaults to "%D" in the C locale. %X is a locale-specific synonym, which defaults to "%T" in the C locale. %y is replaced by the year without century (00-99). %Y is replaced by the year with century. +%z is replaced by the time zone as a numeric offset (e.g +0530, -0800 etc.) %Z is replaced by the time zone abbreviation. The number of options reflects the `strftime' function. ＠＠ -1063,13 +1067,15 ＠＠ { Extbyte *buf = alloca_extbytes (size); Extbyte *formext; + /* make a copy of the static buffer returned by localtime() */ + struct tm tm = * localtime(&value); + *buf = 1; /* !!#### this use of external here is not totally safe, and potentially data lossy. */ LISP_STRING_TO_EXTERNAL (format_string, formext, Qnative); - if (emacs_strftime (buf, size, formext, - localtime (&value)) + if (emacs_strftime (buf, size, formext, &tm) || !*buf) return build_ext_string (buf, Qnative); /* If buffer was too small, make it bigger. */ Index: src/strftime.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/strftime.c,v retrieving revision 1.6 diff -u -r1.6 strftime.c --- src/strftime.c 2002/03/29 04:48:37 1.6 +++ src/strftime.c 2004/12/09 02:40:18 ＠＠ -58,6 +58,7 ＠＠ %S second (00..61) %T time, 24-hour (hh:mm:ss) %X locale's time representation (%H:%M:%S) + %z time zone offset (e.g. +0530, -0800 etc) %Z time zone (EDT), or nothing if no time zone is determinable Date fields: ＠＠ -70,10 +71,13 ＠＠ %d day of month (01..31) %e day of month ( 1..31) %D date (mm/dd/yy) + %G year corresponding to the ISO 8601 week + %g Year of the ISO 8601 week within century (00 - 99) %h same as %b %j day of year (001..366) %m month (01..12) %U week number of year with Sunday as first day of week (00..53) + %V ISO 8601 week number (first week is the earliest one with Thu) %w day of week (0..6) %W week number of year with Monday as first day of week (00..53) %x locale's date representation (mm/dd/yy) ＠＠ -235,6 +239,30 ＠＠ return dl <= 0 ? 0 : dl / 7 + (dl % 7 != 0); } +#ifndef __isleap +/* Nonzero if YEAR is a leap year (every 4 years, + except every 100th isn't, and every 400th is). */ +# define __isleap(year) \ + ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) +#endif + +/* The number of days from the first day of the first ISO week of this + year to the year day YDAY with week day WDAY. ISO weeks start on + Monday; the first ISO week has the year's first Thursday. YDAY may + be as small as YDAY_MINIMUM. */ +#define ISO_WEEK_START_WDAY 1 /* Monday */ +#define ISO_WEEK1_WDAY 4 /* Thursday */ +#define YDAY_MINIMUM (-366) +static int +iso_week_days (int yday, int wday) +{ + /* Add enough to the first operand of % to make it nonnegative. */ + int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7; + return (yday + - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7 + + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); +} + #if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME) char *zone_name (const struct tm *tp); char * ＠＠ -362,10 +390,125 ＠＠ length += strftime (&string[length], max - length, "%H:%M:%S", tm); break; + + case 'V': + case 'g': + case 'G': + { + int year = tm->tm_year + 1900; + int days = iso_week_days (tm->tm_yday, tm->tm_wday); + + if (days < 0) + { + /* This ISO week belongs to the previous year. */ + year--; + days = + iso_week_days (tm->tm_yday + (365 + __isleap (year)), + tm->tm_wday); + } + else + { + int d = + iso_week_days (tm->tm_yday - (365 + __isleap (year)), + tm->tm_wday); + if (0 <= d) + { + /* This ISO week belongs to the next year. */ + year++; + days = d; + } + } + + switch (*format) + { + /* + #### FIXME + We really can't assume 1000 <= year <= 9999 + once time_t gets beyond 32 bits, but it's true + of the rest of the code here so get with the + program + */ + case 'g': + length += + add_num2 (&string[length], year % 100, + max - length, pad); + break; + + case 'G': + add_char (year / 1000 + '0'); + length += add_num3 (&string[length], year % 1000, + max - length, zero); + break; + + default: + length += + add_num2 (&string[length], days / 7 + 1, + max - length, pad); + break; + } + } + break; case 'X': length += strftime (&string[length], max - length, "%H:%M:%S", tm); break; + case 'z': + { + /* + #### FIXME: could use tm->tm_gmtoff if present. Since + the other code in xemacs does not do so we follow the + leaders (and don't add a autoconf macro to detect + its presence). + */ + long int offset; + long int minutes; + struct tm lt, *ut; + time_t utc; + + lt = *tm; + utc = mktime(&lt); + ut = gmtime(&utc); + /* assume that tm is valid so the others will be too! */ + assert( utc != (time_t) -1 && ut != NULL ); + + /* tm diff code below is based on mktime.c, glibc 2.3.2 */ + { + int lt4, ut4, lt100, ut100, lt400, ut400; + int intervening_leap_days, years, days; + + lt4 = (lt.tm_year >> 2) + (1900 >> 2) - + ! (lt.tm_year & 3); + ut4 = (ut->tm_year >> 2) + (1900 >> 2) - + ! (ut->tm_year & 3); + lt100 = lt4 / 25 - (lt4 % 25 < 0); + ut100 = ut4 / 25 - (ut4 % 25 < 0); + lt400 = lt100 >> 2; + ut400 = ut100 >> 2; + intervening_leap_days = + (lt4 - ut4) - (lt100 - ut100) + (lt400 - ut400); + years = lt.tm_year - ut->tm_year; + days = (365 * years + intervening_leap_days + + (lt.tm_yday - ut->tm_yday)); + offset = (60 * (60 * (24 * days + (lt.tm_hour - ut->tm_hour)) + + (lt.tm_min - ut->tm_min)) + + (lt.tm_sec - ut->tm_sec)); + } + + minutes = offset / ( offset < 0 ? -60 : 60 ); + + add_char ((offset < 0 ? '-' : '+')); + + if ( minutes / 600 != 0 ) + add_char (minutes / 600 + '0'); + else if ( pad != none ) + add_char ((pad == zero ? '0' : ' ')); + + length += + add_num3 (&string[length], + ((minutes / 60 ) % 10) * 100 + (minutes % 60), + max - length, pad); + break; + } case 'Z': #ifdef HAVE_TM_ZONE length += add_str (&string[length], tm->tm_zone, max - length);

2 participants
1 comments

[PATCH] Adjust the 2D Mule charsets; allow ~5,000,000 Unicode code points. 18 years, 6 months

Aidan Kehoe

This patches moves to supporting ~500,000 Unicode code points that would otherwise be trashed by the editor. Previously, it was it was of the order of 18,000 code points. man/ChangeLog addition: 2006-06-24 Aidan Kehoe <kehoea(a)parhasard.net> * internals/internals.texi (Internal String Encoding): Mention that UTF-8 would be a reasonable alternative encoding. * internals/internals.texi (Internal Character Encoding): Re-arrange the description of characters to deal with 21-bit characters. src/ChangeLog addition: 2006-06-24 Aidan Kehoe <kehoea(a)parhasard.net> * charset.h: Move to 7 bits instead of 5 for the first field of a character. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/charset.h man/internals/internals.texi Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.75 xodiff -u -u -r1.75 internals.texi --- man/internals/internals.texi 2006/04/23 16:11:28 1.75 +++ man/internals/internals.texi 2006/06/24 21:15:25 ＠＠ -11335,10 +11335,12 ＠＠ the actual multi-byte encoding. ＠end enumerate - None of the standard non-modal encodings meet all of these + None of the pre-Unciode standard non-modal encodings meet all of these conditions. For example, EUC satisfies only (2) and (3), while -Shift-JIS and Big5 (not yet described) satisfy only (2). (All -non-modal encodings must satisfy (2), in order to be unambiguous.) +Shift-JIS and Big5 (not yet described) satisfy only (2). (All non-modal +encodings must satisfy (2), in order to be unambiguous.) UTF-8, +however, meets all three, and we are considering moving to it as an +internal encoding. ＠node Internal Character Encoding, , Internal String Encoding, Internal Mule Encodings ＠subsection Internal Character Encoding ＠＠ -11346,16 +11348,16 ＠＠＠cindex character encoding, internal ＠cindex encoding, internal character - One 19-bit word represents a single character. The word is + One 21-bit word represents a single character. The word is separated into three fields: ＠example -Bit number: 18 17 16 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 - <------------> <------------------> <------------------> -Field: 1 2 3 +Bit number: 20 19 18 17 16 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 + <------------------> <------------------> <------------------> +Field: 1 2 3 ＠end example - Note that fields 2 and 3 hold 7 bits each, while field 1 holds 5 bits. + Note that each field holds 7 bits. ＠example Character set Field 1 Field 2 Field 3 ＠＠ -11370,12 +11372,12 ＠＠ range: (20 - 6F) (20 - 7F) Dimension-2 official LB - 0x8F PC1 PC2 range: (01 - 0A) (20 - 7F) (20 - 7F) -Dimension-2 private LB - 0xE1 PC1 PC2 +Dimension-2 private LB - 0x80 PC1 PC2 range: (0F - 1E) (20 - 7F) (20 - 7F) Composite 0x1F ? ? ＠end example -Note that character codes 0 - 255 are the same as the ``binary +Note also that character codes 0 - 255 are the same as the ``binary encoding'' described above. Most of the code in XEmacs knows nothing of the representation of a ＠＠ -11607,7 +11609,7 ＠＠ you cannot do the standard C trick of passing a pointer to a character to a function that expects a string. -An Ichar takes up 19 bits of representation and (for code compatibility +An Ichar takes up 21 bits of representation and (for code compatibility and such) is compatible with an int. This representation is visible on the Lisp level. The important characteristics of the Ichar representation are Index: src/charset.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/charset.h,v retrieving revision 1.13 diff -u -u -r1.13 charset.h --- src/charset.h 2006/06/03 17:50:54 1.13 +++ src/charset.h 2006/06/24 21:15:27 ＠＠ -140,8 +140,8 ＠＠ #define PRE_LEADING_BYTE_PRIVATE_2 0x9F /* 2-byte char-set */ #define MIN_LEADING_BYTE_PRIVATE_1 0xA0 -#define MAX_LEADING_BYTE_PRIVATE_1 0xEF -#define MIN_LEADING_BYTE_PRIVATE_2 0xF0 +#define MAX_LEADING_BYTE_PRIVATE_1 0xC0 +#define MIN_LEADING_BYTE_PRIVATE_2 0xC1 #define MAX_LEADING_BYTE_PRIVATE_2 0xFF #define NUM_LEADING_BYTES 129 ＠＠ -354,9 +354,9 ＠＠ /************************************************************************/ /* The bit fields of character are divided into 3 parts: - FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */ + FIELD1(7bits):FIELD2(7bits):FIELD3(7bits) */ -#define ICHAR_FIELD1_MASK (0x1F << 14) +#define ICHAR_FIELD1_MASK (0x7F << 14) #define ICHAR_FIELD2_MASK (0x7F << 7) #define ICHAR_FIELD3_MASK 0x7F ＠＠ -376,7 +376,7 ＠＠ #define FIELD2_TO_PRIVATE_LEADING_BYTE 0x80 #define FIELD1_TO_OFFICIAL_LEADING_BYTE (MIN_LEADING_BYTE_OFFICIAL_2 - 1) -#define FIELD1_TO_PRIVATE_LEADING_BYTE 0xE1 +#define FIELD1_TO_PRIVATE_LEADING_BYTE 0x80 /* Minimum and maximum allowed values for the fields. */ ＠＠ -406,7 +406,7 ＠＠ #define MIN_CHAR_PRIVATE_TYPE9N (MIN_ICHAR_FIELD2_PRIVATE << 7) #define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_ICHAR_FIELD1_OFFICIAL << 14) #define MIN_CHAR_PRIVATE_TYPE9NX9N (MIN_ICHAR_FIELD1_PRIVATE << 14) -#define MIN_CHAR_COMPOSITION (0x1F << 14) +#define MIN_CHAR_COMPOSITION (0x7F << 14) /* Leading byte of a character. -- Santa Maradona, priez pour moi!

1 participants
2 comments

[PATCH 21.5] -Wdeclaration-after-statement support 18 years, 6 months

Jerry James

PATCH 21.5 This patch captures the values of __GNUC__ and __GNUC_MINOR__ in configure variables when gcc is used. It uses them to see if gcc 3.4 or later is in use and, if so, adds -Wdeclaration-after-statement to the warning flags when compiling with C. I am interested in finding out whether this approach is acceptable to the other developers. In particular, is the $(( ... )) syntax okay? It is standard Bourne shell (see the Single Unix Specification on www.unix.org), but it is not used anywhere in our present configure script. Is anyone using a shell that does not support that syntax? ChangeLog addition: 2006-06-20 Jerry James <james(a)xemacs.org> * configure.ac: When gcc is used, capture the values of __GNUC__ and __GNUC_MINOR__. Use them to conditionally add warning flags that are not supported by all versions of gcc. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.43 diff -d -u -r1.43 configure.ac --- configure.ac 2006/06/06 00:18:29 1.43 +++ configure.ac 2006/06/20 17:11:33 ＠＠ -1883,15 +1883,13 ＠＠ dnl Determine GCC version. if test "$GCC" = "yes"; then AC_RUN_IFELSE([AC_LANG_SOURCE([int main () { -#if __GNUC__ >= 3 -return 11; -#else -return 0; -#endif -}])], [:], -[case "$?" in - 11) echo "You appear to be using GCC version 3 or above."; __GCC3=yes ;; -esac]) +return __GNUC__; +}])], [:], [__GCC="$?"]) +AC_RUN_IFELSE([AC_LANG_SOURCE([int main () { +return __GNUC_MINOR__; +}])], [:], [__GCC_MINOR="$?"]) +__GCC_VERSION=$__GCC"."$__GCC_MINOR +echo "You appear to be using GCC version" $__GCC_VERSION fi dnl Support for using a different compiler for xemacs itself. ＠＠ -2311,7 +2309,7 ＠＠ dnl Warnings about char subscripts are pretty pointless, though, dnl and we use them in various places. with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts" - test "$__GCC3" = "yes" && with_cflags_warning="$with_cflags_warning -Wpacked" + test $((__GCC)) -ge 3 && with_cflags_warning="$with_cflags_warning -Wpacked" dnl glibc is intentionally not `-Wpointer-arith'-clean. dnl Ulrich Drepper has rejected patches to fix the glibc header files. test "$have_glibc" != "yes" && \ ＠＠ -2327,8 +2325,11 ＠＠ dnl some very ugly code changes. if test "$with_xemacs_compiler" = "g++"; then xe_cflags_warning="$with_cflags_warning -Weffc++" - elif test "$__GCC3" = "yes"; then + elif test $((__GCC)) -ge 3; then xe_cflags_warning="$with_cflags_warning -Wunused-parameter" + if test $((__GCC)) -gt 3 || test $((__GCC_MINOR)) -ge 4; then + with_cflags_warning="$with_cflags_warning -Wdeclaration-after-statement" + fi fi with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations" with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes" -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

2 participants
6 comments

[PATCH 21.5] shell-command regression 18 years, 6 months

Jerry James

PATCH 21.5 Invoking shell-command with a buffer name or object and an asynchronous command (i.e., one ending with "&") does NOT put the shell output into the requested buffer like it did in 21.4. This patch fixes the regression. lisp/ChangeLog addition: 2006-06-30 Jerry James <james(a)xemacs.org> * process.el (shell-command): If a specific output buffer was requested, use it. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: lisp/process.el Index: lisp/process.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/process.el,v retrieving revision 1.19 diff -d -u -r1.19 process.el --- lisp/process.el 2005/01/09 09:44:44 1.19 +++ lisp/process.el 2006/06/30 20:49:29 ＠＠ -359,8 +359,8 ＠＠ ;; Command ending with ampersand means asynchronous. (progn (if-fboundp 'background - (background (substring command 0 - (match-beginning 0))) + (background (substring command 0 (match-beginning 0)) + output-buffer) (error 'unimplemented "backgrounding a shell command requires package `background'"))) -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

1 participants
1 comments

[AC21.5] Shut up marking and insertion commands in test suite 18 years, 6 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Several of the tests call functions that produce messages concerning marks being set or text inserted. This patch introduces a macro Silence-Message for use in the test suite to suppress such output, and uses it in several places. Index: tests/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v retrieving revision 1.81 diff -u -r1.81 ChangeLog --- tests/ChangeLog 24 Jun 2006 13:50:19 -0000 1.81 +++ tests/ChangeLog 24 Jun 2006 13:54:47 -0000 ＠＠ -0,0 +1,7 ＠＠ +2006-06-24 Stephen J. Turnbull <stephen(a)xemacs.org> + + * automated/test-harness.el (Silence-Message): New macro. + * automated/mule-tests.el: Use it. + * automated/region-tests.el: Use it. + * automated/tag-tests.el: Use it. + Index: tests/automated/mule-tests.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/mule-tests.el,v retrieving revision 1.9 diff -u -r1.9 mule-tests.el --- tests/automated/mule-tests.el 3 Jun 2006 17:51:06 -0000 1.9 +++ tests/automated/mule-tests.el 24 Jun 2006 13:54:47 -0000 ＠＠ -340,18 +340,18 ＠＠ 'iso-8859-2)) ) ;; This is how you suppress output from `message', called by `write-region' - (flet ((append-message (&rest args) ())) - (Assert (not (equal name1 name2))) - (Assert (not (file-exists-p name1))) - (write-region (point-min) (point-max) name1) - (Assert (file-exists-p name1)) - (when (fboundp 'make-symbolic-link) - (make-symbolic-link name1 name2) - (Assert (file-exists-p name2)) - (Assert (equal (file-truename name2) name1)) - (Assert (equal (file-truename name1) name1))) + (Assert (not (equal name1 name2))) + (Assert (not (file-exists-p name1))) + (Silence-Message + (write-region (point-min) (point-max) name1)) + (Assert (file-exists-p name1)) + (when (fboundp 'make-symbolic-link) + (make-symbolic-link name1 name2) + (Assert (file-exists-p name2)) + (Assert (equal (file-truename name2) name1)) + (Assert (equal (file-truename name1) name1))) - (ignore-file-errors (delete-file name1) (delete-file name2)))) + (ignore-file-errors (delete-file name1) (delete-file name2))) ;; Add many more file operation tests here... Index: tests/automated/region-tests.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/region-tests.el,v retrieving revision 1.1 diff -u -r1.1 region-tests.el --- tests/automated/region-tests.el 24 Feb 2005 23:02:37 -0000 1.1 +++ tests/automated/region-tests.el 24 Jun 2006 13:54:47 -0000 ＠＠ -43,10 +43,12 ＠＠ ;; Using active regions (let ((zmacs-regions t) (first-buffer (current-buffer))) - (insert (buffer-name)) + (Silence-Message + (insert (buffer-name))) (Assert (not (region-exists-p))) (Assert (not (region-active-p))) - (mark-whole-buffer) + (Silence-Message + (mark-whole-buffer)) (Assert (region-exists-p)) (Assert (region-active-p)) ;; Turn off active regions ＠＠ -62,7 +64,8 ＠＠ ;; Region is active again (Assert (region-active-p)) (with-temp-buffer - (insert (buffer-name)) + (Silence-Message + (insert (buffer-name))) ;; Region exists in first buffer, not this second one (Assert (not (region-exists-p))) ;; Region not active in this second temp buffer ＠＠ -70,7 +73,8 ＠＠ ;; Region still active in first temp buffer (Assert (eq (zmacs-region-buffer) first-buffer)) ;; Activate region in second temp buffer - (mark-whole-buffer) + (Silence-Message + (mark-whole-buffer)) ;; Region exists in second temp buffer (Assert (region-exists-p)) ;; Region active in second temp buffer Index: tests/automated/tag-tests.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/tag-tests.el,v retrieving revision 1.3 diff -u -r1.3 tag-tests.el --- tests/automated/tag-tests.el 13 May 2004 16:41:27 -0000 1.3 +++ tests/automated/tag-tests.el 24 Jun 2006 13:54:47 -0000 ＠＠ -68,20 +68,23 ＠＠ (let ((tags-always-exact t)) ;; Search for the tag "mystruct"; this should succeed - (find-tag "mystruct") + (Silence-Message + (find-tag "mystruct")) (Assert (eq (point) 2)) ;; Search again. The search should fail, based on the patch that ;; Sven Grundmann submitted for 21.4.16. (Check-Error-Message error "No more entries matching mystruct" - (tags-loop-continue))) + (Silence-Message + (tags-loop-continue)))) (let ((tags-always-exact nil)) ;; Search for the definition of "require". Until the etags.el upgrade ;; from 21.5 in 21.4.16, this test would fail. (condition-case nil - (find-tag "require") + (Silence-Message + (find-tag "require")) (t t)) (Assert (eq (point) 52))) Index: tests/automated/test-harness.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/test-harness.el,v retrieving revision 1.21 diff -u -r1.21 test-harness.el --- tests/automated/test-harness.el 24 Jun 2006 13:50:23 -0000 1.21 +++ tests/automated/test-harness.el 24 Jun 2006 13:54:47 -0000 ＠＠ -38,6 +38,14 ＠＠ ;;; Implementation-Incomplete-Expect-Failure wrapper macros to mark them. ;;; A lot of the tests we run push limits; suppress Ebola message with the ;;; Ignore-Ebola wrapper macro. +;;; Some noisy code will call `message'. Output from `message' can be +;;; suppressed with the Silence-Message macro. Functions that are known to +;;; issue messages include `write-region', `find-tag', `tag-loop-continue', +;;; `insert', and `mark-whole-buffer'. N.B. The Silence-Message macro +;;; currently does not suppress the newlines printed by `message'. +;;; Definitely do not use Silence-Message with Check-Message. +;;; In general it should probably only be used on code that prepares for a +;;; test, not on tests. ;;; ;;; You run the tests using M-x test-emacs-test-file, ;;; or $(EMACS) -batch -l .../test-harness.el -f batch-test-emacs file ... ＠＠ -291,7 +299,7 ＠＠ ,quoted-body ',expected-error error-info) (incf wrong-error-failures))))) - + ;; Do not use this with Silence-Message. (defmacro Check-Message (expected-message-regexp &rest body) (Skip-Test-Unless (fboundp 'defadvice) "can't defadvice" ＠＠ -322,6 +330,10 ＠＠ ,quoted-body error-info) (incf other-failures))) (ad-unadvise 'message))))) + + ;; #### Perhaps this should override `message' itself, too? + (defmacro Silence-Message (&rest body) + `(flet ((append-message (&rest args) ())) ,＠body)) (defmacro Ignore-Ebola (&rest body) `(let ((debug-issue-ebola-notices -42)) ,＠body)) -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

3 participants
2 comments

[AC21.5R21.4] Document X11R7 distros often omit bitmaps 18 years, 6 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 RECOMMEND 21.4 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.502 diff -u -r1.502 ChangeLog --- ChangeLog 16 May 2006 08:22:56 -0000 1.502 +++ ChangeLog 16 May 2006 15:30:22 -0000 ＠＠ -0,0 +1,4 ＠＠ +2006-05-17 Stephen J. Turnbull <stephen(a)xemacs.org> + + * PROBLEMS: X11R7 loses x11/bitmaps/gray. + Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.341 diff -u -r1.341 ChangeLog --- man/ChangeLog 16 May 2006 08:23:49 -0000 1.341 +++ man/ChangeLog 16 May 2006 15:30:23 -0000 ＠＠ -0,0 +1,6 ＠＠ +2006-05-17 Stephen J. Turnbull <stephen(a)xemacs.org> + + * xemacs-faq.texi (Q2.2.3): New node. + (Q2.2.2, Q2.3.1): Fix navigation references. + (Top, Installation): Add to menus. + Index: PROBLEMS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/PROBLEMS,v retrieving revision 1.71 diff -u -r1.71 PROBLEMS --- PROBLEMS 16 Nov 2005 12:12:57 -0000 1.71 +++ PROBLEMS 16 May 2006 15:30:22 -0000 ＠＠ -44,6 +44,16 ＠＠ Much general information is in INSTALL. If it's covered in INSTALL, we don't repeat it here. +*** X11/bitmaps/gray (or other X11-related file) not found. + +The X11R6 distribution was monolithic, but the X11R7 distribution is +much more modular. Many OS distributions omit these bitmaps (assuming +nobody uses them, evidently). Your OS distribution should have a +developer's package containing these files, probably with a name +containing the string "bitmap". Known package names (you may need to +add an extension such as .deb or .rpm) include x11/xbitmaps (Ubuntu) +and xorg-x11-xbitmaps (Fedora Core 5). + *** How do I configure to get the buffer tabs/progress bars? These features depend on support for "native widgets". Use the Index: man/xemacs-faq.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v retrieving revision 1.88 diff -u -r1.88 xemacs-faq.texi --- man/xemacs-faq.texi 27 Dec 2005 18:51:21 -0000 1.88 +++ man/xemacs-faq.texi 16 May 2006 15:30:24 -0000 ＠＠ -293,6 +293,7 ＠＠ 2.2: Unix/Mac OS X Installation (Also Relevant to Cygwin, MinGW) * Q2.2.1:: Libraries in non-standard locations * Q2.2.2:: Why can't I strip XEmacs? +* Q2.2.3:: X11/bitmaps/gray (or other X11-related file) not found. 2.3: Windows Installation (Windows, Cygwin, MinGW) * Q2.3.1:: What exactly are all the different ways to build XEmacs under Windows? ＠＠ -3089,6 +3090,7 ＠＠ 2.2: Unix/Mac OS X Installation (Also Relevant to Cygwin, MinGW) * Q2.2.1:: Libraries in non-standard locations * Q2.2.2:: Why can't I strip XEmacs? +* Q2.2.3:: X11/bitmaps/gray (or other X11-related file) not found. 2.3: Windows Installation (Windows, Cygwin, MinGW) * Q2.3.1:: What exactly are all the different ways to build XEmacs under Windows? ＠＠ -3584,7 +3586,7 ＠＠ --with-site-prefixes=WHATEVER ＠end example -＠node Q2.2.2, Q2.3.1, Q2.2.1, Installation +＠node Q2.2.2, Q2.2.3, Q2.2.1, Installation ＠unnumberedsubsec Q2.2.2: Why can't I strip XEmacs? ＠email{cognot＠(a)fronsac.ensg.u-nancy.fr, Richard Cognot} writes: ＠＠ -3639,9 +3641,20 ＠＠＠end enumerate ＠end quotation +＠node Q2.2.3, Q2.3.1, Q2.2.2, Installation +＠unnumberedsubsec Q2.2.3: X11/bitmaps/gray (or other X11-related file) not found. + +The X11R6 distribution was monolithic, but the X11R7 distribution is +much more modular. Many OS distributions omit these bitmaps (assuming +nobody uses them, evidently). Your OS distribution should have a +developer's package containing these files, probably with a name +containing the string "bitmap". Known package names (you may need to +add an extension such as .deb or .rpm) include x11/xbitmaps (Ubuntu) +and xorg-x11-xbitmaps (Fedora Core 5). + ＠unnumberedsec 2.3: Windows Installation (Windows, Cygwin, MinGW) -＠node Q2.3.1, Q2.3.2, Q2.2.2, Installation +＠node Q2.3.1, Q2.3.2, Q2.2.3, Installation ＠unnumberedsubsec Q2.3.1: What exactly are all the different ways to build XEmacs under Windows? XEmacs can be built in several ways in the MS Windows environment. -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

2 participants
1 comments

[AC21.5R21.4] Improve geometry debugging messages 18 years, 6 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 RECOMMEND 21.4 Should apply to 21.4 but I haven't actually tested. This is "safe" in the sense that the builder has to directly specify the controlling #define, there's no ordinary way to configure it. So only developers explicitly trying to debug geometry management will ever run into it. I haven't found a way to completely test this, as I don't have a window manager that ever returns XtGeometryAlmost. :-) However, the Shell dimensions reported are now meaningful and correct. Based on a suggestion by Francois L'Archeveque. diff --git a/src/ChangeLog b/src/ChangeLog index cca5be4..12a7348 100644 --- src/ChangeLog +++ src/ChangeLog ＠＠ -0,0 +1,6 ＠＠ +2006-05-08 Stephen J. Turnbull <stephen(a)xemacs.org> + + * EmacsShell-sub.c (RootGeometryManager): + Change garbage to useful messages under DEBUG_GEOMETRY_MANAGEMENT. + Based on a suggestion by Francois L'Archeveque. + index ed82214..e335a4a 100644 --- src/EmacsShell-sub.c +++ src/EmacsShell-sub.c ＠＠ -339,11 +339,16 ＠＠ RootGeometryManager (Widget gw, result == XtGeometryAlmost ? "XtGeometryAlmost" : "XtGeometryDone"); if (reply->request_mode & CWWidth) - printf ("width returned;"); + printf ("width returned was %d%s", + reply->width, + reply->request_mode & CWHeight ? "; " : ".\n"); if (reply->request_mode & CWHeight) - printf ("height returned;"); - printf ("\n"); - printf (" resulting shell size: %d %d\n", reply->width, reply->height); + printf ("height returned was %d.\n", reply->height); + /* #### does this also need to depend on the result? + With XtGeometryYes there doesn't seem to be a useful reply object. */ + printf (" resulting shell size: %d %d\n", + reply->request_mode & CWWidth ? reply->width : w->core.width, + reply->request_mode & CWHeight ? reply->height : w->core.height); printf ("----------\n"); fflush (stdout); #endif -- School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

3 participants
3 comments

[PATCH 21.4] Collected fixes from static checkers 18 years, 6 months

Jerry James

PATCH 21.4 DO NOT APPLY THIS PATCH: It is causing an assertion failure in the md5 tests. I will track it down and send a superceding version of this patch. I'm only sending this because I spent so much time writing it.:-) Please review it anyway. If there is anything controversial, I'm happy to split it out as a separate patch. This is the 21.4 version of the patches I've been applying to 21.5 recently, to fix various problems (or potential problems) found by various code analysis tools. I ran the tools over the 21.4 base and found a few that don't appear in the 21.5 code base, as well. I won't repeat the rationale for those that have already been sent in for 21.5, but will describe the new changes for 21.4. EmacsShell-sub.c: If the for loop terminates because i becomes too large, then child will not have been initialized, so dereferencing it is bad. Let's just dereference it where we set it. dumper.c: The array 'backtrace' has 65536 elements. Here we are checking to see if we have overflowed the array, but the check is off by one. If me == 65536, then we will try to access backtrace[65536], but that's the first bad element, not the last good one. editfns.c: The array warnpath is shorter than the array path, but we were copying from path to warnpath without checking how many bytes were transferred. I tried to rationalize the code a bit. This code was rewritten for 21.5. keymap.c: Actually, this problem appears in 21.5 too. I'll send in a patch for it later. We are allocating a new array and then throwing it away. It looks like we are rolling our own realloc() here. I don't understand that, but we might as well finish the job instead of leaking memory. sound.c: We're discussing this one on xemacs-beta right now. This is my preferred solution. lwlib/ChangeLog addition: 2006-06-22 Jerry James <james(a)xemacs.org> * lwlib-Xlw.c (xlw_scrollbar_callback): Do not dereference instance before checking whether it is NULL. * xlwmenu.c (xlw_map_menu): Prevent uninitialized access to root and waste. src/ChangeLog addition: 2006-06-22 Jerry James <james(a)xemacs.org> * EmacsShell-sub.c (ChangeManaged): * device-x.c (x_IO_error_handler): Do not dereference d if it is NULL. * dgif_lib.c (DGifCloseFile): Do not dereference GifFile before checking if it is NULL. Also fix a memory leak. * dialog-x.c (dbox_selection_callback): Ensure f is non-NULL, then dereference it, not the other way around. * dumper.c (pdump_register_object): Fix off-by-one array bounds overflow check. * dumper.c (pdump_register_struct): Ditto. * editfns.c (Ftemp_directory): Don't let a copy from (long) path to (short) warnpath overflow warnpath. * extents.c (detach_all_extents): Call extent_list_delete_all with a non-NULL parameter only. * glyphs-widget.c (widget_query_geometry): Guard against possibly NULL width and height. * input-method-xlib.c (XIM_SetGeometry): Do not dereference f or xic before checking if they are NULL. * keymap.c (where_is_recursive_mapper): Don't throw away the newly allocated array. * md5.c (Fmd5): Check whether Lstream_read encountered an error. * nas.c (Err): Fix a memory leak. * redisplay-gtk.c (gtk_output_display_block): Fix a Dynarr leak. Don't create the buffer if there is nothing to do. * redisplay-msw.c (mswindows_output_display_block): Ditto. * redisplay-output.c (redisplay_output_layout): Ditto. * redisplay-tty.c (tty_output_display_block): Ditto. * redisplay-x.c (x_output_display_block): Ditto. * scrollbar-gtk.c (gtk_free_scrollbar_instance): Do not dereference instance->scrollbar_data if it is NULL. * scrollbar-x.c (x_free_scrollbar_instance): Ditto. * scrollbar-msw.c (mswindows_free_scrollbar_instance): Ditto, but for sb->scrollbar_data. * sound.c (init_native_sound): Avoid a buffer overflow by allocating a buffer with the appropriate size. xemacs-21.4 source patch: Diff command: cvs -q diff -uN Files affected: src/sound.c src/scrollbar-x.c src/scrollbar-msw.c src/scrollbar-gtk.c src/redisplay-x.c src/redisplay-tty.c src/redisplay-output.c src/redisplay-msw.c src/redisplay-gtk.c src/nas.c src/md5.c src/keymap.c src/input-method-xlib.c src/glyphs-widget.c src/extents.c src/editfns.c src/dumper.c src/dialog-x.c src/dgif_lib.c src/device-x.c src/EmacsShell-sub.c lwlib/xlwmenu.c lwlib/lwlib-Xlw.c Index: lwlib/lwlib-Xlw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xlw.c,v retrieving revision 1.8.2.2 diff -d -u -r1.8.2.2 lwlib-Xlw.c --- lwlib/lwlib-Xlw.c 2005/11/26 03:47:33 1.8.2.2 +++ lwlib/lwlib-Xlw.c 2006/06/22 23:33:13 ＠＠ -163,13 +163,13 ＠＠ XlwScrollBarCallbackStruct *data = (XlwScrollBarCallbackStruct *) call_data; scroll_event event_data; - scrollbar_values *val = - (scrollbar_values *) instance->info->val->scrollbar_data; + scrollbar_values *val; double percent; if (!instance || widget->core.being_destroyed) return; + val = (scrollbar_values *) instance->info->val->scrollbar_data; id = instance->info->id; percent = (double) (data->value - 1) / (double) (INT_MAX - 1); Index: lwlib/xlwmenu.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v retrieving revision 1.33.2.2 diff -d -u -r1.33.2.2 xlwmenu.c --- lwlib/xlwmenu.c 2003/02/15 18:57:19 1.33.2.2 +++ lwlib/xlwmenu.c 2006/06/22 23:33:14 ＠＠ -3412,8 +3412,8 ＠＠ if (!mw->menu.pointer_grabbed) { XWindowAttributes ret; - Window parent,root; - Window *waste; + Window parent,root = 0UL; + Window *waste = NULL; unsigned int num_waste; lw_menu_active = True; Index: src/EmacsShell-sub.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v retrieving revision 1.5.2.2 diff -d -u -r1.5.2.2 EmacsShell-sub.c --- src/EmacsShell-sub.c 2005/01/31 02:55:01 1.5.2.2 +++ src/EmacsShell-sub.c 2006/06/22 23:33:14 ＠＠ -366,11 +366,11 ＠＠ for (i = 0; i < w->composite.num_children; i++) { if (XtIsManaged(w->composite.children[i])) { child = w->composite.children[i]; + update_size_hints_internal (w, child->core.width, + child->core.height); break; } } - - update_size_hints_internal (w, child->core.width, child->core.height); } /* call the real ChangeManaged */ Index: src/device-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v retrieving revision 1.36.2.3 diff -d -u -r1.36.2.3 device-x.c --- src/device-x.c 2005/01/31 02:55:08 1.36.2.3 +++ src/device-x.c 2006/06/22 23:33:14 ＠＠ -1161,8 +1161,10 ＠＠ Xlib might just decide to exit(). So we mark the offending console for deletion and throw to top level. */ if (d) - enqueue_magic_eval_event (io_error_delete_device, dev); - DEVICE_X_BEING_DELETED (d) = 1; + { + enqueue_magic_eval_event (io_error_delete_device, dev); + DEVICE_X_BEING_DELETED (d) = 1; + } Fthrow (Qtop_level, Qnil); return 0; /* not reached */ Index: src/dgif_lib.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dgif_lib.c,v retrieving revision 1.12.2.1 diff -d -u -r1.12.2.1 dgif_lib.c --- src/dgif_lib.c 2004/05/06 22:21:43 1.12.2.1 +++ src/dgif_lib.c 2006/06/22 23:33:14 ＠＠ -366,10 +366,11 ＠＠ ******************************************************************************/ int DGifCloseFile(GifFileType *GifFile) { - GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private; + GifFilePrivateType *Private; if (GifFile == NULL) return -1; + Private = (GifFilePrivateType *)GifFile->Private; if (!IS_READABLE(Private)) { /* This file was NOT open for reading: */ ＠＠ -930,7 +931,10 ＠＠ Object->Colors = (GifColorType *)calloc(ColorCount, sizeof(GifColorType)); if (Object->Colors == (GifColorType *)NULL) + { + free (Object); return((ColorMapObject *)NULL); + } Object->ColorCount = ColorCount; Object->BitsPerPixel = BitSize(ColorCount); Index: src/dialog-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dialog-x.c,v retrieving revision 1.7 diff -d -u -r1.7 dialog-x.c --- src/dialog-x.c 2001/04/12 18:23:34 1.7 +++ src/dialog-x.c 2006/06/22 23:33:14 ＠＠ -105,7 +105,7 ＠＠ ourselves. */ #ifdef EXTERNAL_WIDGET /* #### Not sure if this special case is necessary. */ - if (!FRAME_X_EXTERNAL_WINDOW_P (f) && f) + if (f && !FRAME_X_EXTERNAL_WINDOW_P (f)) #else if (f) #endif Index: src/dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.2.2.5 diff -d -u -r1.2.2.5 dumper.c --- src/dumper.c 2005/01/31 02:55:08 1.2.2.5 +++ src/dumper.c 2006/06/22 23:33:14 ＠＠ -566,7 +566,7 ＠＠ if (imp->description) { int me = depth++; - if (me>65536) + if (me>=65536) { stderr_out ("Backtrace overflow, loop ?\n"); ABORT (); ＠＠ -601,7 +601,7 ＠＠ { int me = depth++; int i; - if (me>65536) + if (me>=65536) { stderr_out ("Backtrace overflow, loop ?\n"); ABORT (); Index: src/editfns.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/editfns.c,v retrieving revision 1.27.2.4 diff -d -u -r1.27.2.4 editfns.c --- src/editfns.c 2002/08/20 11:36:52 1.27.2.4 +++ src/editfns.c 2006/06/22 23:33:14 ＠＠ -644,14 +644,17 ＠＠ } else { - strcpy(path, getenv("HOME")); strncat(path, "/tmp/", _POSIX_PATH_MAX); + path[5 + _POSIX_PATH_MAX] = '\0'; + strncpy(path, getenv("HOME"), 5 + _POSIX_PATH_MAX); + strncat(path, "/tmp/", 5 + _POSIX_PATH_MAX); if (stat(path, &st) < 0 && errno == ENOENT) { int fd; - char warnpath[1+_POSIX_PATH_MAX]; + char warnpath[6+_POSIX_PATH_MAX]; mkdir(path, 0700); /* ignore retvals */ - strcpy(warnpath, path); - strncat(warnpath, ".created_by_xemacs", _POSIX_PATH_MAX); + warnpath[_POSIX_PATH_MAX] = '\0'; + strncpy(warnpath, path, 5 + _POSIX_PATH_MAX); + strncat(warnpath, ".created_by_xemacs", 5 + _POSIX_PATH_MAX); if ((fd = open(warnpath, O_WRONLY|O_CREAT, 0644)) > 0) { write(fd, "XEmacs created this directory because /tmp/<yourname> was unavailable -- \nPlease check !\n", 89); Index: src/extents.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v retrieving revision 1.31.2.4 diff -d -u -r1.31.2.4 extents.c --- src/extents.c 2005/01/31 02:55:13 1.31.2.4 +++ src/extents.c 2006/06/22 23:33:14 ＠＠ -1175,11 +1175,12 ＠＠ set_extent_start (e, -1); set_extent_end (e, -1); } + + /* But we need to clear all the lists containing extents or + havoc will result. */ + extent_list_delete_all (data->extents); } - /* But we need to clear all the lists containing extents or - havoc will result. */ - extent_list_delete_all (data->extents); soe_invalidate (object); } } Index: src/glyphs-widget.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-widget.c,v retrieving revision 1.2.2.2 diff -d -u -r1.2.2.2 glyphs-widget.c --- src/glyphs-widget.c 2002/11/07 06:04:44 1.2.2.2 +++ src/glyphs-widget.c 2006/06/22 23:33:14 ＠＠ -558,20 +558,20 ＠＠ IMAGE_INSTANCE_WIDGET_FACE (ii), &w, &h, 0, domain); /* Adjust the size for borders. */ - if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) + if (width && IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) *width = w + 2 * widget_instance_border_width (ii); - if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) + if (height && IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) *height = h + 2 * widget_instance_border_width (ii); } } /* Finish off with dynamic sizing. */ - if (!NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii))) + if (width && !NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii))) { dynamic_width = Feval (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)); if (INTP (dynamic_width)) *width = XINT (dynamic_width); } - if (!NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii))) + if (height && !NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii))) { dynamic_height = Feval (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)); if (INTP (dynamic_height)) Index: src/input-method-xlib.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/input-method-xlib.c,v retrieving revision 1.12.2.1 diff -d -u -r1.12.2.1 input-method-xlib.c --- src/input-method-xlib.c 2005/01/31 02:55:20 1.12.2.1 +++ src/input-method-xlib.c 2006/06/22 23:33:14 ＠＠ -426,13 +426,18 ＠＠ void XIM_SetGeometry (struct frame *f) { - XIC xic = FRAME_X_XIC (f); - XIMStyle style = FRAME_X_XIC_STYLE (f); + XIC xic; + XIMStyle style; XRectangle area; - if (!xic || !f) + if (!f) return; + xic = FRAME_X_XIC (f); + if (!xic) + return; + + style = FRAME_X_XIC_STYLE (f); if (style & XIMStatusArea) { /* Place Status Area in bottom right corner */ Index: src/keymap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v retrieving revision 1.32.2.4 diff -d -u -r1.32.2.4 keymap.c --- src/keymap.c 2005/01/31 02:55:20 1.32.2.4 +++ src/keymap.c 2006/06/22 23:33:15 ＠＠ -3663,6 +3663,8 ＠＠ struct key_data *new = xnew_array (struct key_data, size); memcpy ((void *)new, (const void *)c->keys_so_far, c->keys_so_far_total_size * sizeof (struct key_data)); + xfree (c->keys_so_far); + c->keys_so_far = new; } else XREALLOC_ARRAY (c->keys_so_far, struct key_data, size); Index: src/md5.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/md5.c,v retrieving revision 1.9 diff -d -u -r1.9 md5.c --- src/md5.c 2001/04/12 18:24:01 1.9 +++ src/md5.c 2006/06/22 23:33:15 ＠＠ -581,7 +581,7 ＠＠ Bufbyte tempbuf[1024]; /* some random amount */ Lstream_data_count size_in_bytes = Lstream_read (XLSTREAM (instream), tempbuf, sizeof (tempbuf)); - if (!size_in_bytes) + if (size_in_bytes <= 0) break; /* Process the bytes. */ Index: src/nas.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nas.c,v retrieving revision 1.7.2.2 diff -d -u -r1.7.2.2 nas.c --- src/nas.c 2002/10/31 15:08:26 1.7.2.2 +++ src/nas.c 2006/06/22 23:33:15 ＠＠ -751,7 +751,7 ＠＠ /* Stuff taken from wave.c from NAS. Just like snd files, NAS can't read wave data from memory, so these functions do that for us. */ -#define Err() { return NULL; } +#define Err() { free (wi); return NULL; } #define readFourcc(_f) dread(_f, sizeof(RIFF_FOURCC), 1) #define cmpID(_x, _y) \ strncmp((char *) (_x), (char *) (_y), sizeof(RIFF_FOURCC)) Index: src/redisplay-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-gtk.c,v retrieving revision 1.2.2.3 diff -d -u -r1.2.2.3 redisplay-gtk.c --- src/redisplay-gtk.c 2005/01/31 02:55:27 1.2.2.3 +++ src/redisplay-gtk.c 2006/06/22 23:33:15 ＠＠ -294,7 +294,7 ＠＠ int cursor_width, int cursor_height) { struct frame *f = XFRAME (w->frame); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; Lisp_Object window; struct display_block *db = Dynarr_atp (dl->display_blocks, block); ＠＠ -326,7 +326,7 ＠＠ if (end < 0) end = Dynarr_length (rba); - Dynarr_reset (buf); + buf = Dynarr_new (Emchar); while (elt < end) { Index: src/redisplay-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-msw.c,v retrieving revision 1.29.2.2 diff -d -u -r1.29.2.2 redisplay-msw.c --- src/redisplay-msw.c 2005/01/31 02:55:27 1.29.2.2 +++ src/redisplay-msw.c 2006/06/22 23:33:15 ＠＠ -1,4 +1,4 ＠＠ -/* mswindows output and frame manipulation routines. +* mswindows output and frame manipulation routines. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Lucid, Inc. Copyright (C) 1995 Sun Microsystems, Inc. ＠＠ -1044,7 +1044,7 ＠＠ int cursor_width, int cursor_height) { struct frame *f = XFRAME (w->frame); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; Lisp_Object window; struct display_block *db = Dynarr_atp (dl->display_blocks, block); ＠＠ -1071,7 +1071,7 ＠＠ if (end < 0) end = Dynarr_length (rba); - Dynarr_reset (buf); + buf = Dynarr_new (Emchar); while (elt < end) { Index: src/redisplay-output.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-output.c,v retrieving revision 1.12.2.4 diff -d -u -r1.12.2.4 redisplay-output.c --- src/redisplay-output.c 2005/01/31 02:55:28 1.12.2.4 +++ src/redisplay-output.c 2006/06/22 23:33:15 ＠＠ -1317,7 +1317,7 ＠＠ { Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); Lisp_Object rest, window = DOMAIN_WINDOW (domain); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; struct window *w = XWINDOW (window); struct device *d = DOMAIN_XDEVICE (domain); int layout_height, layout_width; ＠＠ -1333,6 +1333,8 ＠＠ /* This makes the glyph area fit into the display area. */ if (!redisplay_normalize_glyph_area (db, dga)) return; + + buf = Dynarr_new (Emchar); /* Highly dodgy optimization. We want to only output the whole layout if we really have to. */ Index: src/redisplay-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-tty.c,v retrieving revision 1.16.2.2 diff -d -u -r1.16.2.2 redisplay-tty.c --- src/redisplay-tty.c 2005/11/28 02:10:20 1.16.2.2 +++ src/redisplay-tty.c 2006/06/22 23:33:15 ＠＠ -196,7 +196,7 ＠＠ int cursor_height) { struct frame *f = XFRAME (w->frame); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; struct display_block *db = Dynarr_atp (dl->display_blocks, block); rune_dynarr *rba = db->runes; ＠＠ -222,7 +222,7 ＠＠ if (end < 0) end = Dynarr_length (rba); - Dynarr_reset (buf); + buf = Dynarr_new (Emchar); while (elt < end && Dynarr_atp (rba, elt)->xpos < start_pixpos) { Index: src/redisplay-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v retrieving revision 1.25.2.5 diff -d -u -r1.25.2.5 redisplay-x.c --- src/redisplay-x.c 2005/01/31 02:55:28 1.25.2.5 +++ src/redisplay-x.c 2006/06/22 23:33:15 ＠＠ -318,7 +318,7 ＠＠ int cursor_width, int cursor_height) { struct frame *f = XFRAME (w->frame); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; Lisp_Object window; struct display_block *db = Dynarr_atp (dl->display_blocks, block); ＠＠ -345,7 +345,7 ＠＠ if (end < 0) end = Dynarr_length (rba); - Dynarr_reset (buf); + buf = Dynarr_new (Emchar); while (elt < end) { Index: src/scrollbar-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-gtk.c,v retrieving revision 1.2.2.4 diff -d -u -r1.2.2.4 scrollbar-gtk.c --- src/scrollbar-gtk.c 2005/01/31 02:55:30 1.2.2.4 +++ src/scrollbar-gtk.c 2006/06/22 23:33:15 ＠＠ -57,14 +57,16 ＠＠ static void gtk_free_scrollbar_instance (struct scrollbar_instance *instance) { - if (SCROLLBAR_GTK_WIDGET (instance)) + if (instance->scrollbar_data) { - gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); - gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); - } + if (SCROLLBAR_GTK_WIDGET (instance)) + { + gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); + gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); + } - if (instance->scrollbar_data) - xfree (instance->scrollbar_data); + xfree (instance->scrollbar_data); + } } /* A device method. */ Index: src/scrollbar-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v retrieving revision 1.11.2.5 diff -d -u -r1.11.2.5 scrollbar-msw.c --- src/scrollbar-msw.c 2005/01/31 02:55:31 1.11.2.5 +++ src/scrollbar-msw.c 2006/06/22 23:33:15 ＠＠ -83,9 +83,11 ＠＠ static void mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) { - DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); if (sb->scrollbar_data) - xfree (sb->scrollbar_data); + { + DestroyWindow (SCROLLBAR_MSW_HANDLE (sb)); + xfree (sb->scrollbar_data); + } } static void Index: src/scrollbar-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v retrieving revision 1.17.2.1 diff -d -u -r1.17.2.1 scrollbar-x.c --- src/scrollbar-x.c 2005/01/31 02:55:31 1.17.2.1 +++ src/scrollbar-x.c 2006/06/22 23:33:15 ＠＠ -71,19 +71,21 ＠＠ static void x_free_scrollbar_instance (struct scrollbar_instance *instance) { - if (SCROLLBAR_X_NAME (instance)) - xfree (SCROLLBAR_X_NAME (instance)); - - if (SCROLLBAR_X_WIDGET (instance)) + if (instance->scrollbar_data) { - if (XtIsManaged (SCROLLBAR_X_WIDGET (instance))) - XtUnmanageChild (SCROLLBAR_X_WIDGET (instance)); + if (SCROLLBAR_X_NAME (instance)) + xfree (SCROLLBAR_X_NAME (instance)); - lw_destroy_all_widgets (SCROLLBAR_X_ID (instance)); - } + if (SCROLLBAR_X_WIDGET (instance)) + { + if (XtIsManaged (SCROLLBAR_X_WIDGET (instance))) + XtUnmanageChild (SCROLLBAR_X_WIDGET (instance)); - if (instance->scrollbar_data) - xfree (instance->scrollbar_data); + lw_destroy_all_widgets (SCROLLBAR_X_ID (instance)); + } + + xfree (instance->scrollbar_data); + } } /* A device method. */ Index: src/sound.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v retrieving revision 1.12 diff -d -u -r1.12 sound.c --- src/sound.c 2001/04/12 18:24:19 1.12 +++ src/sound.c 2006/06/22 23:33:15 ＠＠ -517,7 +517,7 ＠＠ DEVICE_ON_CONSOLE_P (d) = 0; else { - char hn [255]; + char *hn = alloca_array (char, strlen (h->h_name) + 1); struct hostent *l; strcpy (hn, h->h_name); l = gethostbyname (localname); -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

2 participants
2 comments

[PATCH 21.4] Add line-beginning-position, line-end-position 18 years, 6 months

Ville Skyttä

21.4 (already in 21.5) This patch adds line-beginning-position and line-end-position to the 21.4 series. We've seen these being erratically used here and there in packages a few times and lisp things out there outside of the packages tree uses these functions pretty often, I guess they're thought of as ubiquitous by many. The latest problem due to lack of these functions I'm aware of was reported as https://bugzilla.redhat.com/192481 : the current haskell-mode's indentation is broken on 21.4. Jerry, in case you're around, it could be a good idea to fix haskell-*indent.el to not use line-(beginning|end)-position in the meantime.

4 participants
6 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches June 2006