November 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[AC21.5] Avoid warning, don't redefine integer types on Mac OS X 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.884 diff -u -U0 -r1.884 ChangeLog --- ChangeLog 13 Nov 2005 10:48:01 -0000 1.884 +++ ChangeLog 16 Nov 2005 05:36:39 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * database.c: Don't redefine integer types for Mac OS X, either. + Index: src/database.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v retrieving revision 1.37 diff -u -r1.37 database.c --- src/database.c 25 Oct 2005 11:16:22 -0000 1.37 +++ src/database.c 16 Nov 2005 04:24:10 -0000 ＠＠ -47,7 +47,7 ＠＠ #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ #include <inttypes.h> -#if !defined(__FreeBSD__) && !defined(__NetBSD__) +#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; -- 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

2 participants
1 comments

[AC21.5] 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 This patch is informational only (I'm expect the Japanese text will get munged). Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.50 diff -u -U0 -r1.50 ChangeLog --- ChangeLog 13 Nov 2005 10:39:28 -0000 1.50 +++ ChangeLog 16 Nov 2005 05:33:38 -0000 ＠＠ -0,0 +1,8 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * canna/canna_api.c: Small fixes to Mule-ization patch. + +2005-11-01 Ben Wing <ben(a)xemacs.org> + + * canna/canna_api.c: Mule-ization. + Index: modules/canna/canna_api.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/canna/canna_api.c,v retrieving revision 1.2 diff -u -r1.2 canna_api.c --- modules/canna/canna_api.c 21 Oct 2005 15:48:35 -0000 1.2 +++ modules/canna/canna_api.c 16 Nov 2005 04:37:37 -0000 ＠＠ -2,6 +2,7 ＠＠ Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. + Copyright (C) 2005 Ben Wing. This file is part of XEmacs. ＠＠ -175,8 +176,7 ＠＠ /* #### is this global really necessary? */ #define KEYTOSTRSIZE 2048 -static char key_buffer[KEYTOSTRSIZE]; -static char **warning; +static Extbyte key_buffer[KEYTOSTRSIZE]; static int canna_empty_info, canna_through_info; static int canna_underline; ＠＠ -200,13 +200,15 ＠＠ static Lisp_Object storeResults (char *, int, jrKanjiStatus *); static Lisp_Object kanjiYomiList (int, int); static Lisp_Object CANNA_mode_keys (void); +static Lisp_Object Qeuc_jp; + +#define make_euc_string(p, len) make_ext_string ((Extbyte *) p, len, Qeuc_jp) +#define build_euc_string(p) build_ext_string ((Extbyte *) p, Qeuc_jp) #ifdef CANNA_MULE -static void m2c (unsigned char *, int, unsigned char *); -static Lisp_Object mule_make_string (unsigned char *, int); -static int mule_strlen (unsigned char *, int); -static void count_char (unsigned char *,int, int, int, Fixnum *, Fixnum *, Fixnum *); -#define make_string mule_make_string +static int euc_jp_num_chars (unsigned char *, int); +static void count_char (unsigned char *,int, int, int, Fixnum *, Fixnum *, + Fixnum *); #endif /* Lisp functions definition */ ＠＠ -234,12 +236,12 ＠＠ if (len < 0) { /* Error detected */ - val = make_string ((unsigned char*) jrKanjiError, strlen (jrKanjiError)); + val = build_euc_string (jrKanjiError); } else { /* ³ÎÄê¤·¤¿Ê¸»úÎó (the confirmed string) */ - Vcanna_kakutei_string = make_string ((unsigned char *) buf, len); + Vcanna_kakutei_string = make_euc_string (buf, len); val = make_int (len); /* ³ÎÄê¤·¤¿Ê¸»úÎó¤ÎÆÉ¤ß¤Î¾ðÊó... (info about the reading of the confirmed string) */ ＠＠ -254,13 +256,13 ＠＠ int yomilen2; Vcanna_kakutei_yomi = - make_string ((unsigned char *) p, yomilen); /* ÆÉ¤ß (reading) */ + make_euc_string (p, yomilen); /* ÆÉ¤ß (reading) */ p += yomilen + 1; yomilen2 = strlen (p); if (len + yomilen + yomilen2 + 2 < KEYTOSTRSIZE) { Vcanna_kakutei_romaji = - make_string ((unsigned char *) p, yomilen2); + make_euc_string (p, yomilen2); /* ¥í¡¼¥Þ»ú (romanization) */ } } ＠＠ -272,7 +274,7 ＠＠ Vcanna_henkan_string = Qnil; if (ks->length >= 0) { - Vcanna_henkan_string = make_string (ks->echoStr, ks->length); + Vcanna_henkan_string = make_euc_string (ks->echoStr, ks->length); #ifndef CANNA_MULE canna_henkan_length = ks->length; canna_henkan_revPos = ks->revPos; ＠＠ -280,10 +282,10 ＠＠ #else /* CANNA_MULE */ if (canna_underline) { - canna_henkan_length = mule_strlen (ks->echoStr,ks->length); - canna_henkan_revPos = mule_strlen (ks->echoStr,ks->revPos); - canna_henkan_revLen = mule_strlen (ks->echoStr+ks->revPos, - ks->revLen); + canna_henkan_length = euc_jp_num_chars (ks->echoStr,ks->length); + canna_henkan_revPos = euc_jp_num_chars (ks->echoStr,ks->revPos); + canna_henkan_revLen = euc_jp_num_chars (ks->echoStr+ks->revPos, + ks->revLen); } else { ＠＠ -298,8 +300,8 ＠＠ Vcanna_ichiran_string = Qnil; if (ks->info & KanjiGLineInfo && ks->gline.length >= 0) { - Vcanna_ichiran_string = make_string (ks->gline.line, - ks->gline.length); + Vcanna_ichiran_string = make_euc_string (ks->gline.line, + ks->gline.length); #ifndef CANNA_MULE canna_ichiran_length = ks->gline.length; canna_ichiran_revPos = ks->gline.revPos; ＠＠ -316,8 +318,7 ＠＠ Vcanna_mode_string = Qnil; if (ks->info & KanjiModeInfo) { - Vcanna_mode_string = - make_string (ks->mode, strlen ((const char *) ks->mode)); + Vcanna_mode_string = build_euc_string ((Extbyte *) ks->mode); } /* ¤½¤ÎÂ¾¤Î¾ðÊó (other information) */ ＠＠ -365,7 +366,7 ＠＠ { Lisp_Object val; int res; - unsigned char **p, **q; + char **p, **q; int kugiri; /* Ê¸Àá¶èÀÚ¤ê¤ò¤¹¤ë¤«¡© (display clause separator?) */ ＠＠ -388,13 +389,10 ＠＠ } else { - char servername[256]; - CHECK_STRING (server); - strncpy (servername, (const char *) XSTRING_DATA (server), - XSTRING_LENGTH (server)); - servername[XSTRING_LENGTH (server)] = '\0'; - jrKanjiControl (0, KC_SETSERVERNAME, servername); + jrKanjiControl (0, KC_SETSERVERNAME, + /* !!#### Check encoding */ + NEW_LISP_STRING_TO_EXTERNAL (server, Qnative)); } if (NILP (rcfile)) ＠＠ -403,40 +401,37 ＠＠ } else { - char rcname[256]; - CHECK_STRING (rcfile); - strncpy (rcname, (const char *) XSTRING_DATA (rcfile), - XSTRING_LENGTH (rcfile)); - rcname[XSTRING_LENGTH (rcfile)] = '\0'; - jrKanjiControl (0, KC_SETINITFILENAME, rcname); + jrKanjiControl (0, KC_SETINITFILENAME, + NEW_LISP_STRING_TO_EXTERNAL (rcfile, Qfile_name)); } - warning = (char **) 0; + { + char **warning = (char **) 0; #ifdef nec_ews_svr4 - stop_polling (); + stop_polling (); #endif /* nec_ews_svr4 */ - res = jrKanjiControl (0, KC_INITIALIZE, (char *)&warning); + res = jrKanjiControl (0, KC_INITIALIZE, (char *) &warning); #ifdef nec_ews_svr4 - start_polling (); + start_polling (); #endif /* nec_ews_svr4 */ - val = Qnil; - if (warning) - { - for (p = q = (unsigned char **) warning ; *q ; q++) - ; - while (p < q) - { - q--; - val = Fcons (make_string (*q, strlen ((const char *) *q)), val); - } - } - val = Fcons (val, Qnil); + val = Qnil; + if (warning) + { + for (p = q = warning ; *q ; q++) + ; + while (p < q) + { + q--; + val = Fcons (build_euc_string (*q), val); + } + } + val = Fcons (val, Qnil); + } if (res == -1) { - val = Fcons (make_string ((unsigned char *) jrKanjiError, - strlen (jrKanjiError)), val); + val = Fcons (build_euc_string (jrKanjiError), val); /* ¥¤¥Ë¥·¥ã¥é¥¤¥º¤Ç¼ºÇÔ¤·¤¿¾ì¹ç¡£ (on initialization failure) */ return Fcons (Qnil, val); } ＠＠ -477,16 +472,20 ＠＠ ()) { Lisp_Object val; - unsigned char **p; + char **p; + char **warning = (char **) 0; - jrKanjiControl (0, KC_FINALIZE, (char *)&warning); + jrKanjiControl (0, KC_FINALIZE, (char *) &warning); val = Qnil; if (warning) { - for (p = (unsigned char**) warning ; *p ; p++) + for (p = warning ; *p; p++) { - val = Fcons (make_string (*p, strlen ((const char *) *p)), val); + /* !!#### This is almost certainly wrong; `canna-initialize + starts at the end of the warnings so the resulting list is + in the correct order. We should do the same. */ + val = Fcons (build_euc_string (*p), val); } } val = Fcons (val, Qnil); ＠＠ -501,21 +500,11 ＠＠ { jrKanjiStatusWithValue ksv; jrKanjiStatus ks; -#ifdef CANNA_MULE - unsigned char cbuf[4096]; -#endif CHECK_STRING (str); ksv.buffer = (unsigned char *) key_buffer; ksv.bytes_buffer = KEYTOSTRSIZE; -#ifndef CANNA_MULE - ks.echoStr = XSTRING_DATA (str); - ks.length = XSTRING_LENGTH (str); -#else /* CANNA_MULE */ - m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf); - ks.echoStr = cbuf; - ks.length = strlen ((const char *) cbuf); -#endif /* CANNA_MULE */ + LISP_STRING_TO_SIZED_EXTERNAL (str, ks.echoStr, ks.length, Qeuc_jp); ksv.ks = &ks; jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv); return storeResults (key_buffer, ksv.val, ksv.ks); ＠＠ -577,17 +566,13 ＠＠ { jrKanjiStatusWithValue ksv; jrKanjiStatus ks; + Extbyte *ext; CHECK_STRING (yomi); -#ifndef CANNA_MULE - strncpy (key_buffer, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi)); - ks.length = XSTRING_LENGTH (yomi); - key_buffer[ks.length] = '\0'; -#else /* CANNA_MULE */ - m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), - (unsigned char *) key_buffer); + LISP_STRING_TO_EXTERNAL (yomi, ext, Qeuc_jp); + strncpy (key_buffer, ext, sizeof (key_buffer)); + key_buffer[sizeof (key_buffer) - 1] = '\0'; ks.length = strlen (key_buffer); -#endif /* CANNA_MULE */ if (NILP (roma)) { ＠＠ -596,17 +581,11 ＠＠ else { CHECK_STRING (roma); - -#ifndef CANNA_MULE - strncpy (key_buffer + XSTRING_LENGTH (yomi) + 1, XSTRING_DATA (roma), - XSTRING_LENGTH (roma)); - key_buffer[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0'; - ks.mode = (unsigned char *)(key_buffer + XSTRING_LENGTH (yomi) + 1); -#else /* CANNA_MULE */ - ks.mode = (unsigned char *)(key_buffer + ks.length + 1); - m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma), - (unsigned char *) ks.mode); -#endif /* CANNA_MULE */ + LISP_STRING_TO_EXTERNAL (roma, ext, Qeuc_jp); + ks.mode = (unsigned char *) (key_buffer + ks.length + 1); + strncpy (key_buffer + ks.length + 1, ext, + sizeof (key_buffer) - ks.length - 1); + key_buffer[sizeof (key_buffer) - 1] = '\0'; } ks.echoStr = (unsigned char *) key_buffer; ＠＠ -653,24 +632,21 ＠＠ (str)) { Lisp_Object val; - unsigned char **p; + Extbyte **p; int n; + Extbyte *ext; CHECK_STRING (str); - -#ifndef CANNA_MULE - strncpy (key_buffer, XSTRING_DATA (str), XSTRING_LENGTH (str)); - key_buffer[XSTRING_LENGTH (str)] = '\0'; -#else /* CANNA_MULE */ - m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), (unsigned char *) key_buffer); -#endif /* CANNA_MULE */ - p = (unsigned char**) key_buffer; + LISP_STRING_TO_EXTERNAL (str, ext, Qeuc_jp); + strncpy (key_buffer, ext, sizeof (key_buffer)); + key_buffer[sizeof (key_buffer) - 1] = '\0'; + p = (Extbyte **) key_buffer; n = jrKanjiControl (0, KC_PARSE, (char *) &p); val = Qnil; while (n > 0) { n--; - val = Fcons (make_string (p[n], strlen ((const char *) p[n])), val); + val = Fcons (build_euc_string (p[n]), val); } return val; } ＠＠ -683,7 +659,7 ＠＠ char buf[256]; jrKanjiControl (0, KC_QUERYMODE, buf); - return make_string ((unsigned char *) buf, strlen (buf)); + return build_euc_string (buf); } /* ＠＠ -740,23 +716,20 ＠＠ (yomi)) { int nbun; + Extbyte *ext; CHECK_STRING (yomi); if (confirmContext () == 0) { return Qnil; } -#ifndef CANNA_MULE - strncpy (yomibuf, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi)); - yomibuf[XSTRING_LENGTH (yomi)] = '\0'; - nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), - (RK_XFER << RK_XFERBITS) | RK_KFER); -#else /* CANNA_MULE */ - m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf); - nbun = RkBgnBun (IRCP_context, (char *) yomibuf, - strlen ((const char *) yomibuf), + + LISP_STRING_TO_EXTERNAL (yomi, ext, Qeuc_jp); + strncpy ((char *) yomibuf, ext, sizeof (yomibuf)); + yomibuf[sizeof (yomibuf) - 1] = '\0'; + + nbun = RkBgnBun (IRCP_context, yomibuf, strlen ((char *) yomibuf), (RK_XFER << RK_XFERBITS) | RK_KFER); -#endif /* CANNA_MULE */ return kanjiYomiList (IRCP_context, nbun); } ＠＠ -765,7 +738,7 ＠＠ kanjiYomiList (int context, int nbun) { Lisp_Object val, res = Qnil; - unsigned char RkBuf[RKBUFSIZE]; + UExtbyte RkBuf[RKBUFSIZE]; int len, i, total; for (i = nbun ; i > 0 ; ) ＠＠ -773,9 +746,9 ＠＠ i--; RkGoTo (context, i); len = RkGetKanji (context, RkBuf, RKBUFSIZE); - val = make_string (RkBuf, len); + val = make_euc_string (RkBuf, len); len = RkGetYomi (context, RkBuf, RKBUFSIZE); - res = Fcons (Fcons (val, make_string (RkBuf, len)), res); + res = Fcons (Fcons (val, make_euc_string (RkBuf, len)), res); if (i < RKBUFSIZE / 2) { kugiri[i] = len; ＠＠ -796,7 +769,7 ＠＠ (bunsetsu)) { int i, slen, len; - unsigned char *p, RkBuf[RKBUFSIZE]; + UExtbyte *p, RkBuf[RKBUFSIZE]; Lisp_Object res = Qnil; CHECK_INT (bunsetsu); ＠＠ -809,14 +782,14 ＠＠ p = RkBuf; for (i = 0 ; i < len ; i++) { - slen = strlen ((const char *) p); + slen = strlen ((char *) p); if (NILP(res)) { - res = Fcons (make_string (p, slen), Qnil); + res = Fcons (make_euc_string (p, slen), Qnil); } else { - XCDR (res) = Fcons (make_string (p, slen), Qnil); + XCDR (res) = Fcons (make_euc_string (p, slen), Qnil); } p += slen + 1; } ＠＠ -1104,6 +1077,8 ＠＠ DEFSUBR (Fcanna_henkan_kakutei); DEFSUBR (Fcanna_henkan_end); DEFSUBR (Fcanna_henkan_quit); + + DEFSYMBOL (Qeuc_jp); } void ＠＠ -1850,84 +1825,10 ＠＠ #endif #ifdef CANNA_MULE -/* To handle MULE internal code and EUC. - I assume CANNA can handle only Japanese EUC. */ - -/* EUC multibyte string to MULE internal string */ - -static void -c2mu (unsigned char *cp, int l, unsigned char *mp) -{ - unsigned char ch, *ep = cp+l; - - while ((cp < ep) && (ch = *cp)) - { - if ((unsigned char) ch == ISO_CODE_SS2) - { - *mp++ = LEADING_BYTE_KATAKANA_JISX0201; - cp++; - } - else if ((unsigned char) ch == ISO_CODE_SS3) - { - *mp++ = LEADING_BYTE_JAPANESE_JISX0212; - cp++; - *mp++ = *cp++; - } - else if (ch & 0x80) - { - *mp++ = LEADING_BYTE_JAPANESE_JISX0208; - *mp++ = *cp++; - } - *mp++ = *cp++; - } - *mp = 0; -} - -/* MULE internal string to EUC multibyte string */ - -static void -m2c (unsigned char *mp, int l, unsigned char *cp) -{ - unsigned char ch, *ep = mp + l; - - while ((mp < ep) && (ch = *mp++)) - { - switch (ch) - { - case LEADING_BYTE_KATAKANA_JISX0201: - *cp++ = ISO_CODE_SS2; - *cp++ = *mp++; - break; - case LEADING_BYTE_JAPANESE_JISX0212: - *cp++ = ISO_CODE_SS3; - case LEADING_BYTE_JAPANESE_JISX0208: - *cp++ = *mp++; - *cp++ = *mp++; - break; - default: - *cp++ = ch; - break; - } - } - *cp = 0; -} - -#undef make_string - -/* make_string after converting EUC string to MULE internal string */ -static Lisp_Object -mule_make_string (unsigned char *p, int l) -{ - unsigned char cbuf[4096]; - - c2mu (p,l,cbuf); - return (make_string (cbuf, strlen ((const char *) cbuf))); -} -/* return the MULE internal string length of EUC string */ -/* Modified by sb to return a character count not byte count. */ +/* Return the number of characters in an EUC-JP string. */ static int -mule_strlen (unsigned char *p, int l) +euc_jp_num_chars (unsigned char *p, int l) { unsigned char ch, *cp = p; int len = 0; -- 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

1 participants
1 comments

[AC21.5] Quiet compiler about unused parameters in sound.el 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Almost everybody has native sound, so I guess it's unusual to see these. They only occur if you don't have sound at all. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.884 diff -u -U0 -r1.884 ChangeLog --- ChangeLog 13 Nov 2005 10:48:01 -0000 1.884 +++ ChangeLog 16 Nov 2005 05:58:28 -0000 ＠＠ -0,0 +1,7 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * sound.c (USED_IF_HAVE_NATIVE_OR_NAS, USED_IF_HAVE_ANY): + New conditional UNUSED macros. + (Fplay_sound_file, Fdevice_sound_enabled_p, init_device_sound): + Use them. + Index: src/sound.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v retrieving revision 1.24 diff -u -r1.24 sound.c --- src/sound.c 5 May 2005 17:10:54 -0000 1.24 +++ src/sound.c 16 Nov 2005 04:24:21 -0000 ＠＠ -51,6 +51,25 ＠＠ #include "syswindows.h" #endif +#ifdef HAVE_NAS_SOUND +#define USED_IF_HAVE_NAS(decl) decl +#else +#define USED_IF_HAVE_NAS(decl) UNUSED (decl) +#endif + +#if defined(HAVE_NATIVE_SOUND) || defined(HAVE_NAS_SOUND) +#define USED_IF_HAVE_NATIVE_OR_NAS(decl) decl +#else +#define USED_IF_HAVE_NATIVE_OR_NAS(decl) UNUSED (decl) +#endif + +#if defined(HAVE_NATIVE_SOUND) || defined(HAVE_NAS_SOUND) \ + || defined(HAVE_ESD_SOUND) +#define USED_IF_HAVE_ANY(decl) decl +#else +#define USED_IF_HAVE_ANY(decl) UNUSED (decl) +#endif + #ifdef HAVE_ESD_SOUND extern int esd_play_sound_file (Extbyte *file, int vol); extern int esd_play_sound_data (Binbyte *data, size_t length, int vol); ＠＠ -87,7 +106,7 ＠＠ Windows the sound file must be in WAV format. DEVICE defaults to the selected device. */ - (file, volume, device)) + (file, volume, USED_IF_HAVE_ANY (device))) { /* This function can call lisp */ int vol; ＠＠ -402,7 +421,7 ＠＠ DEFUN ("device-sound-enabled-p", Fdevice_sound_enabled_p, 0, 1, 0, /* Return t if DEVICE is able to play sound. Defaults to selected device. */ - (device)) + (USED_IF_HAVE_NATIVE_OR_NAS (device))) { #ifdef HAVE_NAS_SOUND if (DEVICE_CONNECTED_TO_NAS_P (decode_device (device))) ＠＠ -487,12 +506,6 ＠＠ return Qnil; } -#ifdef HAVE_NAS_SOUND -#define USED_IF_HAVE_NAS(decl) decl -#else -#define USED_IF_HAVE_NAS(decl) UNUSED (decl) -#endif - DEFUN ("wait-for-sounds", Fwait_for_sounds, 0, 1, 0, /* Wait for all sounds to finish playing on DEVICE. */ ＠＠ -608,7 +621,7 ＠＠ #endif /* HAVE_NATIVE_SOUND */ void -init_device_sound (struct device *d) +init_device_sound (struct device * USED_IF_HAVE_NATIVE_OR_NAS (d)) { #ifdef HAVE_NAS_SOUND init_nas_sound (d); -- 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

1 participants
0 comments

[AC21.5] Quiet byte-compiler in select.el 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.696 diff -u -U0 -r1.696 ChangeLog --- ChangeLog 13 Nov 2005 10:57:59 -0000 1.696 +++ ChangeLog 16 Nov 2005 04:47:27 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * select.el (get-selection): + Quiet bytecompiler (unused condition-case variable). + Index: lisp/select.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/select.el,v retrieving revision 1.15 diff -u -r1.15 select.el --- lisp/select.el 12 Mar 2005 20:57:42 -0000 1.15 +++ lisp/select.el 16 Nov 2005 04:24:06 -0000 ＠＠ -131,7 +131,7 ＠＠ (catch 'converted (if targets (dolist (current-preference data-type) - (condition-case err + (condition-case nil (if (and (memq current-preference targets) (setq res (get-selection-internal type current-preference))) -- 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

1 participants
0 comments

[AC21.5] Eliminate warnings for unused parameters and functions 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.73 diff -u -U0 -r1.73 ChangeLog --- ChangeLog 13 Nov 2005 10:39:34 -0000 1.73 +++ ChangeLog 16 Nov 2005 05:01:39 -0000 ＠＠ -0,0 +1,8 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * xlwcheckbox.c (CheckboxInit): Mark unused parameters. C++ + correctness. + (CheckboxRealize): Don't compile at all if unused. + + * xlwradio.c (RadioDestroy): #if 0 dead code for later removal. + ＠＠ -6 +13,0 ＠＠ - Index: lwlib/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.73 diff -u -r1.73 ChangeLog --- lwlib/ChangeLog 13 Nov 2005 10:39:34 -0000 1.73 +++ lwlib/ChangeLog 16 Nov 2005 04:24:07 -0000 ＠＠ -4,7 +4,6 ＠＠ Add targets distclean-noconfig, realclean-noconfig, extraclean-noconfig. Do some refactoring for cleanliness. - 2005-11-08 Marcus Crestani <crestani(a)xemacs.org> * xlwgauge.c (GaugeInit): Index: lwlib/xlwcheckbox.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwcheckbox.c,v retrieving revision 1.3 diff -u -r1.3 xlwcheckbox.c --- lwlib/xlwcheckbox.c 20 Sep 2004 19:19:17 -0000 1.3 +++ lwlib/xlwcheckbox.c 16 Nov 2005 04:24:07 -0000 ＠＠ -280,17 +280,13 ＠＠ */ /* ARGSUSED */ +#if DRAW_CHECK static void CheckboxDestroy ( -#if DRAW_CHECK Widget w, -#else - Widget UNUSED (w), -#endif XtPointer UNUSED (junk), XtPointer UNUSED (garbage)) { -#if DRAW_CHECK CheckboxWidget cw = (CheckboxWidget) w; /* TODO: cache this via xmu */ ＠＠ -298,8 +294,8 ＠＠ XFreePixmap( XtDisplay(w), cw->checkbox.checkmark ) ; if( cw->checkbox.checkmark_GC != None ) XtReleaseGC(w, cw->checkbox.checkmark_GC) ; -#endif } +#endif /* DRAW_CHECK */ Index: lwlib/xlwradio.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwradio.c,v retrieving revision 1.6 diff -u -r1.6 xlwradio.c --- lwlib/xlwradio.c 10 Nov 2005 15:47:33 -0000 1.6 +++ lwlib/xlwradio.c 16 Nov 2005 04:24:07 -0000 ＠＠ -89,13 +89,17 ＠＠ static void RadioInit (Widget, Widget, ArgList, Cardinal *); static void RadioExpose (Widget, XEvent *, Region); static void RadioResize (Widget); -static void RadioDestroy (Widget, XtPointer, XtPointer); static void RadioClassInit (void); static void RadioClassPartInit (WidgetClass); static Boolean RadioSetValues (Widget, Widget, Widget, ArgList, Cardinal *); static void DrawDiamond (Widget); static XtGeometryResult RadioQueryGeometry (Widget, XtWidgetGeometry *, XtWidgetGeometry *); +#if 0 +/* #### This function isn't used and is slated for destruction. + Can we just nuke it? */ +static void RadioDestroy (Widget, XtPointer, XtPointer); +#endif /* Action procs */ ＠＠ -245,6 +249,9 ＠＠ * Returns: none. */ +#if 0 +/* #### This function isn't used and is slated for destruction. + Can we just nuke it? */ /* ARGSUSED */ static void RadioDestroy (Widget UNUSED (w), ＠＠ -253,7 +260,7 ＠＠ { /* TODO: get rid of this */ } - +#endif /* React to size change from manager. Label widget will compute some internal * stuff, but we need to override. This code requires knowledge of the -- 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

1 participants
0 comments

[AC21.5] Fix uninitialized variable 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.884 diff -u -U0 -r1.884 ChangeLog --- ChangeLog 13 Nov 2005 10:48:01 -0000 1.884 +++ ChangeLog 16 Nov 2005 05:39:49 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * event-Xt.c (x_to_emacs_keysym): Initialize len. + Index: src/event-Xt.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v retrieving revision 1.87 diff -u -r1.87 event-Xt.c --- src/event-Xt.c 27 Sep 2005 05:29:44 -0000 1.87 +++ src/event-Xt.c 16 Nov 2005 04:24:19 -0000 ＠＠ -836,7 +836,7 ＠＠ KeySym keysym = 0; #ifdef HAVE_XIM - int len; + int len = 0; /* Some implementations of XmbLookupString don't return XBufferOverflow correctly, so increase the size of the xim input buffer from 64 to the more reasonable size 513, as Emacs has done. ＠＠ -893,7 +893,7 ＠＠ stderr_out (" keysym=%s", XKeysymToString (keysym)); if (status == XLookupChars || status == XLookupBoth) { - if (len != 1) + if (len > 1) { int j; stderr_out (" chars=\""); -- 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

1 participants
0 comments

[AC21.5] TODO comment in configure.ac 18 years, 5 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.468 diff -u -U0 -r1.468 ChangeLog --- ChangeLog 13 Nov 2005 10:39:39 -0000 1.468 +++ ChangeLog 16 Nov 2005 04:43:09 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (checks for typedefs): TODO comment. + Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.19 diff -u -r1.19 configure.ac --- configure.ac 13 Nov 2005 07:31:55 -0000 1.19 +++ configure.ac 16 Nov 2005 04:24:05 -0000 ＠＠ -2763,6 +2763,7 ＠＠ AC_TYPE_UID_T AC_TYPE_MODE_T AC_TYPE_OFF_T +dnl #### deprecated 2.13-ism AC_CHECK_TYPE(ssize_t, int) dnl not AC_CHECK_TYPE; lisp.h does hairy conditional typedef -- 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

1 participants
0 comments

[AC] [PACKAGES (gnus)] Sync up with upstream stable 18 years, 5 months

Steve Youngs

APPROVE COMMIT This sync's up the XEmacs Gnus package with the current upstream stable branch (the 5.10 branch). I'm not including a diff here because it was a tad over 1Mb. I did, however tag CVS so if anyone is curious, you can get a diff with... $ cvs diff -r gnus-1_86 -r sync-with-upstream-2005-11-15 (from the gnus/ dir of course) Adrian, this sync _includes_ your patch to nnir.el. Norbert, you can roll a new Gnus package whenever you feel like. :-) -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | I am Dyslexic of Borg. | | Fusistance is retile. Your arse will be laminated. | |------------------------------------<steve(a)sxemacs.org>---|

2 participants
1 comments

Patch to the new (still unsupported) VC code 18 years, 5 months

Oscar Figueiredo

Hello, please consider the following patch to vc-xemacs.el, it solves a consistent crash of Gnus after loading your new VC code. Your code uses the function 'replace-in-string' but unfortunately the 2nd argument to that function is a regexp which does not what is expected if you're trying to replace something like ?. for instance. If by chance this patch also solves http://list-archive.xemacs.org/xemacs-beta/200405/msg00355.html then please try to speed things (if you've got some time of course) to make your new VC code the default. It's a shame XEmacs is so much behind in supporting SVN. Thanks for your work, Oscar Figueiredo PS: If you want to communicate with me directly please use "oscar at cpe dot fr", oscar(a)xemacs.org gets so much spam I may miss you mail. 2005-11-1 Oscar Figueiredo <oscar(a)xemacs.org> * vc-xemacs.el (subst-char-in-string): Do not use 'replace-in-string' because of the regexp semantic on its second parameter

3 participants
2 comments

[PATCH] packages: sync gnus/nnir.el with upstream gnus cvs 18 years, 5 months

Adrian Aichner

This trivial full sync makes nnir work for me. Without it creating the ephemeral nnir group fails. I'm using nnir-search-engine 'swish-e Let me know any issues. I intend to commit in a few days. Best regards, Adrian packages ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: xemacs-packages/gnus/ChangeLog Index: xemacs-packages/gnus/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/ChangeLog,v retrieving revision 1.93 diff -u -U0 -r1.93 ChangeLog --- xemacs-packages/gnus/ChangeLog 12 Oct 2005 08:11:15 -0000 1.93 +++ xemacs-packages/gnus/ChangeLog 14 Nov 2005 23:36:52 -0000 ＠＠ -0,0 +1,8 ＠＠ +2005-11-15 Adrian Aichner <adrian(a)xemacs.org> + + * lisp/nnir.el: Sync with upstream gnus/contrib/nnir.el. + * lisp/nnir.el (nnir): + * lisp/nnir.el (nnir-group-server): New. + * lisp/nnir.el (nnir-run-glimpse): + * lisp/nnir.el (nnir-run-swish-e): + packages source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: xemacs-packages/gnus/lisp/nnir.el Index: xemacs-packages/gnus/lisp/nnir.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/nnir.el,v retrieving revision 1.1 diff -u -w -r1.1 nnir.el --- xemacs-packages/gnus/lisp/nnir.el 28 Sep 2004 02:21:17 -0000 1.1 +++ xemacs-packages/gnus/lisp/nnir.el 14 Nov 2005 23:33:12 -0000 ＠＠ -18,8 +18,8 ＠＠ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: ＠＠ -376,7 +376,8 ＠＠ ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS.") + "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." +:group 'gnus) ;; Mail backend. ＠＠ -689,7 +690,17 ＠＠ 'gnus-group-make-nnir-group)) (add-hook 'gnus-group-mode-hook 'nnir-group-mode-hook) - +(defmacro nnir-group-server (group) + "Return the server for a foreign newsgroup GROUP. +The returned format is as `gnus-server-to-method' needs it. See +`gnus-group-real-prefix' and `gnus-group-real-name'." + `(let ((gname ,group)) + (if (string-match "^\$[^:]+\$:" gname) + (setq gname (match-string 1 gname)) + nil) + (if (string-match "^\$[^+]+\$\\+\$.+\$$" gname) + (format "%s:%s" (match-string 1 gname) (match-string 2 gname)) + (concat gname ":")))) ;; Summary mode commands. ＠＠ -862,7 +873,7 ＠＠ (let ((artlist nil) (groupspec (cdr (assq 'group query))) (qstring (cdr (assq 'query query))) - (prefix (nnir-read-server-parm 'nnir-glimps-remove-prefix server)) + (prefix (nnir-read-server-parm 'nnir-glimpse-remove-prefix server)) artno dirnam) (when (and group groupspec) (error (concat "It does not make sense to use a group spec" ＠＠ -1191,7 +1202,7 ＠＠ (error "Missing parameter `nnir-swish-e-index-file'"))) (additional-switches (nnir-read-server-parm - 'nnir-swish++-additional-switches server)) + 'nnir-swish-e-additional-switches server)) (cp-list `(,nnir-swish-e-program nil ; input from /dev/null t ; output ＠＠ -1482,17 +1493,6 ＠＠ ;; (symbol-value key)) ;; (symbol-value key)) ;; )) - -(defmacro nnir-group-server (group) - "Returns the server for a foreign newsgroup in the format as gnus-server-to-method needs it. Compare to gnus-group-real-prefix and gnus-group-real-name." - `(let ((gname ,group)) - (if (string-match "^\$[^:]+\$:" gname) - (setq gname (match-string 1 gname)) - nil) - (if (string-match "^\$[^+]+\$\\+\$.+\$$" gname) - (format "%s:%s" (match-string 1 gname) (match-string 2 gname)) - (concat gname ":")) - )) (defun nnir-group-full-name (shortname server) "For the given group name, return a full Gnus group name. -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

2 participants
3 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 November 2005