May 2006 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH (pkgs)] Gud misuses comint-input-sender 18 years, 7 months

Jerry James

PATCH packages While reviewing the use of comint by other packages in preparation for introducing a newly-synced comint.el, I found a number of errors in the use of the current comint. This is the first in a series of patches to fix those errors. I separated them by package to make review easier, and since some packages are externally maintained. xemacs-packages/debug/ChangeLog addition: 2006-05-13 Jerry James <james(a)xemacs.org> * gud.el (gdb-call-showing-gud): comint-input-sender is a variable referring to a function, not a function. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/debug/gud.el Index: xemacs-packages/debug/gud.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/debug/gud.el,v retrieving revision 1.6 diff -d -u -r1.6 gud.el --- xemacs-packages/debug/gud.el 2001/01/22 07:49:30 1.6 +++ xemacs-packages/debug/gud.el 2006/05/13 18:12:37 ＠＠ -1930,7 +1930,8 ＠＠ (defun gdb-call-showing-gud (instance command) (gud-display-gud-buffer instance) - (comint-input-sender (gdb-instance-process instance) command)) + (apply comint-input-sender + (list (gdb-instance-process instance) command))) (defvar gud-target-history ()) -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

1 participants
1 comments

[PATCH (pkgs)] ilisp comint fixes 18 years, 7 months

Jerry James

PATCH packages This is the third in the series of patches to fix comint use. I was going to submit this to the ilisp maintainers, but ilisp.cons.org appears to be gone. Does anybody know if ilisp is maintained anywhere? xemacs-packages/ilisp/ChangeLog addition: 2006-05-13 Jerry James <james(a)xemacs.org> * ilisp-dia.el (setup-ilisp): Change from defunct comint-use-prompt-regexp-instead-of-fields to current comint-use-prompt-regexp. Also set comint-input-filter-functions instead of defunct comint-input-sentinel. * ilisp-rng.el (lisp-match-ring): Change from defunct comint-last-similar-string to current comint-matching-input-from-input-string. * ilisp-xfr.el (return-ilisp): Run the comint-input-filter-functions hook instead of calling the defunct comint-input-sentinel. Also remove the dated version check for setting comint-input-index. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/ilisp/ilisp-xfr.el xemacs-packages/ilisp/ilisp-rng.el xemacs-packages/ilisp/ilisp-dia.el Index: xemacs-packages/ilisp/ilisp-dia.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-dia.el,v retrieving revision 1.5 diff -d -u -r1.5 ilisp-dia.el --- xemacs-packages/ilisp/ilisp-dia.el 2002/06/03 23:37:00 1.5 +++ xemacs-packages/ilisp/ilisp-dia.el 2006/05/13 18:35:04 ＠＠ -170,9 +170,9 ＠＠ ;; Comint defaults (set-ilisp-input-ring-size 200) (setq comint-prompt-regexp "^[^<> ]*>+:? *" - comint-use-prompt-regexp-instead-of-fields t ; Emacs 21 fields don't seem to work with comint-ipc (?) + comint-use-prompt-regexp t ; Emacs 21 fields don't seem to work with comint-ipc (?) comint-get-old-input 'ilisp-get-old-input - comint-input-sentinel (function ignore) + comint-input-filter-functions nil comint-input-filter 'ilisp-input-filter comint-input-sender 'comint-default-send comint-eol-on-send t) Index: xemacs-packages/ilisp/ilisp-rng.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-rng.el,v retrieving revision 1.3 diff -d -u -r1.3 ilisp-rng.el --- xemacs-packages/ilisp/ilisp-rng.el 2001/07/02 09:40:48 1.3 +++ xemacs-packages/ilisp/ilisp-rng.el 2006/05/13 18:35:04 ＠＠ -38,7 +38,7 ＠＠ (push-mark point) (set-ilisp-input-ring-index n) (setq this-command 'comint-previous-similar-input - comint-last-similar-string string) + comint-matching-input-from-input-string string) t) (if (and string (not no-insert)) (progn (comint-kill-input) (insert string) t) Index: xemacs-packages/ilisp/ilisp-xfr.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-xfr.el,v retrieving revision 1.4 diff -d -u -r1.4 ilisp-xfr.el --- xemacs-packages/ilisp/ilisp-xfr.el 2002/06/03 23:37:04 1.4 +++ xemacs-packages/ilisp/ilisp-xfr.el 2006/05/13 18:35:04 ＠＠ -38,15 +38,8 ＠＠ (not (string= (ring-ref (ilisp-get-input-ring) 0) input)))) (ilisp-ring-insert (ilisp-get-input-ring) input)) - (funcall comint-input-sentinel input) - ;; Ugh, comint changing under my feet.... - ;; Note: This used to be - ;; (eq ilisp-emacs-version-id 'gnu-19) - ;; 25/11/94 Marco Antoniotti - (when (or (eq +ilisp-emacs-version-id+ 'fsf-19) - (eq +ilisp-emacs-version-id+ 'fsf-20) - (eq +ilisp-emacs-version-id+ 'fsf-21)) - (setq comint-input-ring-index nil)) + (run-hook-with-args 'comint-input-filter-functions input) + (setq comint-input-ring-index nil) ;; Nuke symbol table (setq ilisp-original nil) (funcall comint-input-sender proc input) -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

1 participants
1 comments

[PATCH 21.5] Bignum fix for 64-bit platforms 18 years, 7 months

Jerry James

PATCH 21.5 Bignums are broken on 64-bit platforms, and have been since they were first introduced. The problem is a spot in the code where I assumed that EMACS_INT == int. Do we know of any platforms where EMACS_INT == long long? I'll have to think on how to address that. src/ChangeLog addition: 2006-05-08 Jerry James <james(a)xemacs.org> * number.c (Fcanonicalize_number): Use EMACS_INT instead of int, which fixes bignum arithmetic on 64-bit platforms. * number.h (bignum_fits_emacs_int_p): New macro. * number.h (bignum_to_emacs_int): New macro. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: src/number.h src/number.c Index: src/number.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/number.c,v retrieving revision 1.16 diff -d -u -r1.16 number.c --- src/number.c 2005/10/25 11:16:26 1.16 +++ src/number.c 2006/05/08 22:02:35 ＠＠ -408,9 +408,9 ＠＠ number = make_bignum_bg (XRATIO_NUMERATOR (number)); #endif #ifdef HAVE_BIGNUM - if (BIGNUMP (number) && bignum_fits_int_p (XBIGNUM_DATA (number))) + if (BIGNUMP (number) && bignum_fits_emacs_int_p (XBIGNUM_DATA (number))) { - int n = bignum_to_int (XBIGNUM_DATA (number)); + EMACS_INT n = bignum_to_emacs_int (XBIGNUM_DATA (number)); if (NUMBER_FITS_IN_AN_EMACS_INT (n)) number = make_int (n); } Index: src/number.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/number.h,v retrieving revision 1.4 diff -d -u -r1.4 number.h --- src/number.h 2004/05/21 20:56:32 1.4 +++ src/number.h 2006/05/08 22:02:35 ＠＠ -100,6 +100,16 ＠＠ return Fcanonicalize_number (retval); \ } while (0) +#if SIZEOF_EMACS_INT == SIZEOF_LONG +# define bignum_fits_emacs_int_p(b) bignum_fits_long_p(b) +# define bignum_to_emacs_int(b) bignum_to_long(b) +#elif SIZEOF_EMACS_INT == SIZEOF_INT +# define bignum_fits_emacs_int_p(b) bignum_fits_int_p(b) +# define bignum_to_emacs_int(b) bignum_to_int(b) +#else +# error Bignums currently do not work with long long Emacs integers. +#endif + extern Lisp_Object make_bignum (long); extern Lisp_Object make_bignum_bg (bignum); extern bignum scratch_bignum, scratch_bignum2; -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University

4 participants
6 comments

Banned file: "text.doc .pif" in mail from you 18 years, 7 months

MAILER DAEMON

BANNED FILENAME ALERT Your message to: info(a)covance.com was blocked by our Spam Firewall. The email you sent with the following subject has NOT BEEN DELIVERED: Subject: text An attachment in that mail was of a file type that the Spam Firewall is set to block.

1 participants
0 comments

[AC21.5] Stop trashing the xftFont resources 18 years, 7 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Not for 21.4 This should fix the problem that Mats Lidell and perhaps others were experiencing with XEmacs ignoring the tabs resources. The same problem might have affected the menubar under some circumstances, although I haven't actually observed that. **** This patch creates a new resource category, fcFontName. Any **** **** resources that have been using xftFont need to change to **** **** fcFontName (resource class FcFontName). **** This is the case for both the menu widget and the tabs widget. I apologize for the inconvenience, but avoiding it would take substantial effort I can't afford right now. The problem is that there is no Xt resource converter for XftFonts (I've got a draft in a workspace but it's entirely untested, and too risky for even the beta series). So I had a kludge where the xftFont name was transformed into a XftFont* in the widget initialization. Unfortunately, the xftFont resource is also used in the glyphs and frames code, so the initialized resources were getting trashed (actually, we're probably lucky there was no crash). Since xftFont is the natural name for the XftFont * representation, and we'll eventually have an automatic converter, it seems best to reserve it for now. You will have to switch back, once the converter is in place, I'm afraid. Index: lwlib/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.86 diff -u -r1.86 ChangeLog --- lwlib/ChangeLog 2 May 2006 15:30:31 -0000 1.86 +++ lwlib/ChangeLog 12 May 2006 19:04:06 -0000 ＠＠ -0,0 +1,20 ＠＠ +2006-05-12 Stephen J. Turnbull <stephen(a)xemacs.org> + + Make fcFontName and xftFont separate resources. + + * lwlib-fonts.h (XtNfcFontName, XtCFcFontName): New macros. + (XtNxftFont, XtCXftFont): Coalesce the conditional definitions. + + * xlwmenuP.h (XlwMenuPart): + * xlwtabsP.h (TabsPart): + Rename renderFontSpec member to fcFontName. + + * xlwmenu.c (XlwMenuResources): + * xlwtabs.c (resources): + Add a record for fcFontName. + + * xlwtabs.c (TabsInit): Use the fcFontName resource, not xftFont. + + * xlwtabs.c (DrawTab,TabLayout,TabsGeometryManager): Improve + diagnostics. + Index: lwlib/lwlib-fonts.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-fonts.h,v retrieving revision 1.2 diff -u -r1.2 lwlib-fonts.h --- lwlib/lwlib-fonts.h 26 Nov 2005 11:45:59 -0000 1.2 +++ lwlib/lwlib-fonts.h 12 May 2006 19:04:06 -0000 ＠＠ -48,9 +48,11 ＠＠ #ifdef USE_XFT #ifndef XtNxftFont #define XtNxftFont "xftFont" -#endif -#ifndef XtCXftFont #define XtCXftFont "XftFont" +#endif +#ifndef XtNfcFont +#define XtNfcFontName "fcFontName" +#define XtCFcFontName "FcFontName" #endif #endif /* USE_XFT */ Index: lwlib/xlwmenu.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v retrieving revision 1.40 diff -u -r1.40 xlwmenu.c --- lwlib/xlwmenu.c 2 May 2006 15:30:32 -0000 1.40 +++ lwlib/xlwmenu.c 12 May 2006 19:04:07 -0000 ＠＠ -93,9 +93,13 ＠＠ {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), offset(menu.font), XtRString, (XtPointer) "XtDefaultFont"}, #ifdef USE_XFT_MENUBARS - {XtNxftFont, XtCXftFont, XtRString, sizeof (String), - offset(menu.renderFontSpec), + {XtNfcFontName, XtCFcFontName, XtRString, sizeof (String), + offset(menu.fcFontName), XtRString, (XtPointer) "Helvetica-12:bold"}, + /* #### This needs to be fixed to give a proper type and converter for + XftFonts. See also xlwtabs.c. */ + {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer), + offset(menu.renderFont), XtRPointer, (XtPointer) NULL }, #endif # ifdef USE_XFONTSET /* #### Consider using the same method as for Motif; see the comment in ＠＠ -3241,7 +3245,7 ＠＠ conversion function */ mw->menu.renderFont = - xft_open_font_by_name (XtDisplay (mw), mw->menu.renderFontSpec); + xft_open_font_by_name (XtDisplay (mw), mw->menu.fcFontName); #endif make_drawing_gcs (mw); Index: lwlib/xlwmenuP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenuP.h,v retrieving revision 1.5 diff -u -r1.5 xlwmenuP.h --- lwlib/xlwmenuP.h 26 Nov 2005 11:46:00 -0000 1.5 +++ lwlib/xlwmenuP.h 12 May 2006 19:04:07 -0000 ＠＠ -34,8 +34,7 ＠＠ #else XFontStruct * font; #ifdef USE_XFT_MENUBARS - /* #### Fix naming convention here */ - String renderFontSpec; + String fcFontName; XftFont *renderFont; #endif # ifdef USE_XFONTSET Index: lwlib/xlwtabs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v retrieving revision 1.7 diff -u -r1.7 xlwtabs.c --- lwlib/xlwtabs.c 2 May 2006 15:30:32 -0000 1.7 +++ lwlib/xlwtabs.c 12 May 2006 19:04:07 -0000 ＠＠ -150,10 +150,14 ＠＠ {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), offset(font), XtRString, (XtPointer) XtDefaultFont}, #ifdef USE_XFT_TABS - /* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here? */ - {XtNxftFont, XtCXftFont, XtRString, sizeof (String), - offset(renderFontSpec), XtRString, - (XtPointer) "AirCut-16" /* XtDefaultFont */}, + /* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here? + or XtDefaultFont? */ + {XtNfcFontName, XtCFcFontName, XtRString, sizeof(String), + offset(fcFontName), XtRString, (XtPointer) "AirCut-16" }, + /* #### This needs to be fixed to give a proper type and converter for + XftFonts. See also xlwmenu.c. */ + {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer), + offset(renderFont), XtRPointer, (XtPointer) NULL }, #endif {XtNinternalWidth, XtCWidth, XtRDimension, sizeof(Dimension), offset(internalWidth), XtRImmediate, (XtPointer)4 }, ＠＠ -481,7 +485,7 ＠＠ */ newTw->tabs.renderFont = xft_open_font_by_name (XtDisplay ((Widget) newTw), - newTw->tabs.renderFontSpec); + newTw->tabs.fcFontName); if (newTw->tabs.renderFont != NULL) #if XFT_USE_HEIGHT_NOT_ASCENT_DESCENT newTw->tabs.tab_height += newTw->tabs.renderFont->height; ＠＠ -1089,7 +1093,7 ＠＠ get triggered forever after */ int n = control->composite.num_children; ah = control->tabs.tab_height; - if (debug_tabs > 0) + if (debug_tabs > 1) fprintf (stderr, "Kludging around %d != 1 rows," " #children = %d, total height %d, using %d.\n", check_nrows, n, th, ah); ＠＠ -1616,7 +1620,7 ＠＠ GC gc ; int x,y ; - if (debug_tabs > 1) fprintf (stderr, "DrawTab called.\n"); + if (debug_tabs > 2) fprintf (stderr, "DrawTab called.\n"); if( !XtIsRealized((Widget)tw)) return ; ＠＠ -1712,7 +1716,6 ＠＠ (int) strlen (lbl), &glyphinfo); /* #### unnecessary? for the moment, give visual extent */ /* draw background rect */ -#if 1 if (debug_tabs > 2) { fprintf (stderr, "background color: pixel=%08lx, r=%04x," ＠＠ -1725,19 +1728,16 ＠＠ glyphinfo.x, glyphinfo.y, glyphinfo.xOff, glyphinfo.yOff, glyphinfo.width, glyphinfo.height); } - XftDrawRect (xftDraw, &colorDBG, - /* left, top, width, height */ - x+tab->tabs.l_x-glyphinfo.x, - y+tab->tabs.l_y-glyphinfo.y, - glyphinfo.width, glyphinfo.height); -#endif - /* draw text */ if (debug_tabs > 2) + XftDrawRect (xftDraw, &colorDBG, + /* left, top, width, height */ + x+tab->tabs.l_x-glyphinfo.x, + y+tab->tabs.l_y-glyphinfo.y, + glyphinfo.width, glyphinfo.height); + + /* draw text */ + if (debug_tabs > 1) { - FcValue name; - FcValue size; - FcPatternGet (renderFont->pattern, FC_FAMILY, 0, &name); - FcPatternGet (renderFont->pattern, FC_SIZE, 0, &size); fprintf (stderr, "label: %s.\n", lbl); fprintf (stderr, "foreground color: pixel=%08lx, r=%04x," " g=%04x, b=%04x, alpha=%04x.\n", ＠＠ -1747,6 +1747,13 ＠＠ " yOffset=%d, height=%d, width=%d.\n", glyphinfo.x, glyphinfo.y, glyphinfo.xOff, glyphinfo.yOff, glyphinfo.height, glyphinfo.width); + } + if (debug_tabs > 0) + { + FcValue name; + FcValue size; + FcPatternGet (renderFont->pattern, FC_FAMILY, 0, &name); + FcPatternGet (renderFont->pattern, FC_SIZE, 0, &size); fprintf (stderr, "font: name=%s-%.1f," " height=%d, ascent=%d, descent=%d.\n", name.u.s, size.u.d, renderFont->height, ＠＠ -2065,11 +2072,11 ＠＠ /* If wid or hgt is 0, we want to guess our own dimensions. Currently the guessing functions are broken.... #### When PreferredSize*() get fixed, fix this too. */ - if (debug_tabs > 0) + if (debug_tabs > 1) fprintf (stderr, "arg=%d,", wid); wid = (wid ? wid : tw->core.width) - INDENT ; hgt = hgt ? hgt : tw->core.height; - if (debug_tabs > 0) + if (debug_tabs > 1) fprintf (stderr, "wid=%d: x,w,y=", wid); for(i=num_children, childP=tw->composite.children; --i >= 0; ++childP) if( XtIsManaged(*childP) ) ＠＠ -2077,7 +2084,7 ＠＠ tab = (TabsConstraints) (*childP)->core.constraints ; w = tab->tabs.width ; - if (debug_tabs > 0) + if (debug_tabs > 1) fprintf (stderr, "%d,%d,%d;", x, w, y); if( x + w > wid ) { /* new row */ /* #### algorithm is not robust to wid < child's width */ ＠＠ -2100,7 +2107,7 ＠＠ tab->tabs.visible = 1; } - if (debug_tabs > 0) + if (debug_tabs > 1) fprintf (stderr, "\n"); /* If there was only one row, increase the height by TABDELTA */ if( ++display_rows == 1 ) ＠＠ -2127,7 +2134,7 ＠＠ tw->tabs.realRows = row; } - if (debug_tabs > 0 && (row > 1 || display_rows > 1)) + if (debug_tabs > 1 && (row > 1 || display_rows > 1)) fprintf (stderr, "tab: %d display rows, #children = %d," " total height %d, total rows %d%s.\n", display_rows, num_children, y, row, Index: lwlib/xlwtabs.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.h,v retrieving revision 1.2 diff -u -r1.2 xlwtabs.h --- lwlib/xlwtabs.h 12 Apr 2001 18:21:57 -0000 1.2 +++ lwlib/xlwtabs.h 12 May 2006 19:04:07 -0000 ＠＠ -44,16 +44,18 ＠＠ Name Class RepType Default Value ---- ----- ------- ------------- font Font XFontStruct* XtDefaultFont - internalWidth Width Dimension 4 *1 - internalHeight Height Dimension 2 *1 - topWidget TopWidget Widget *2 - callback Callback XtCallbackList NULL *3 - popdownCallback Callback XtCallbackList NULL *4 - selectInsensitive SelectInsensitive Boolean True *5 - beNiceToColormap BeNiceToColormap Boolean False *6 + fcFontName FcFontName String AirCut-16 *0 + xftFont XftFont XtPointer NULL *8 + internalWidth Width Dimension 4 *1 + internalHeight Height Dimension 2 *1 + topWidget TopWidget Widget *2 + callback Callback XtCallbackList NULL *3 + popdownCallback Callback XtCallbackList NULL *4 + selectInsensitive SelectInsensitive Boolean True *5 + beNiceToColormap BeNiceToColormap Boolean False *6 topShadowContrast TopShadowContrast int 20 bottomShadowContrast BottomShadowContrast int 40 - insensitiveContrast InsensitiveContrast int 33 *7 + insensitiveContrast InsensitiveContrast int 33 *7 background Background Pixel XtDefaultBackground border BorderColor Pixel XtDefaultForeground ＠＠ -70,6 +72,7 ＠＠ Notes: + 0 this is a joke, it will be changed. 1 internalWidth, internalHeight specify the margins around the text in the tabs. 2 topWidget identifies the widget which is currently visible. ＠＠ -82,7 +85,8 ＠＠ be selected anyway. 6 BeNiceToColormap causes the Tabs widget to use fewer colors. 7 InsensitiveContrast sets the contrast used for labels of insensitive widgets. - + 8 fcFontName and xftFont are separate resources because there is not yet + registered representation and converter for XftFonts. */ /* Constraint parameters: Index: lwlib/xlwtabsP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabsP.h,v retrieving revision 1.3 diff -u -r1.3 xlwtabsP.h --- lwlib/xlwtabsP.h 26 Nov 2005 11:46:00 -0000 1.3 +++ lwlib/xlwtabsP.h 12 May 2006 19:04:07 -0000 ＠＠ -74,8 +74,8 ＠＠ /* resources */ XFontStruct *font ; #ifdef USE_XFT_TABS - String renderFontSpec; - XftFont *renderFont; + XftFont *renderFont; + String fcFontName; #endif Dimension internalHeight, internalWidth ; Widget topWidget ; ＠＠ -122,7 +122,7 ＠＠ /**************************************************************** * - * constraint record declaration + * Constraint record declaration * ****************************************************************/ -- 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

[PATCH] COPYING update 18 years, 7 months

Jerry James

We still have the FSF's old address in our COPYING files, in both the 21.4 and 21.5 branches. The latest upstream version of COPYING also recognizes the fact that we are no longer living in the 20th century. This patch applies to both 21.4 and 21.5. ChangeLog addition: 2006-04-06 Jerry James <james(a)xemacs.org> * COPYING: Update to latest upstream version. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: COPYING Index: COPYING =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/COPYING,v retrieving revision 1.1.1.1 diff -d -u -r1.1.1.1 COPYING --- COPYING 1996/12/18 22:42:14 1.1.1.1 +++ COPYING 2006/04/06 15:00:39 ＠＠ -2,8 +2,7 ＠＠ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ＠＠ -292,7 +291,7 ＠＠ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by ＠＠ -305,16 +304,16 ＠＠ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. -- 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.5] Pass a device to x-font-menu-font-data-xft 18 years, 7 months

Jerry James

PATCH 21.5 This fixes a problem reported by Giacomo Boffi. The function x-font-menu-font-data-xft expects its 4th argument to be a device. However, when font-menu-this-frame-only-p is non-nil, x-font-men-font-data passes a frame as the 4th argument. This patch ensures that a device is always passed. lisp/ChangeLog addition: 2006-05-10 Jerry James <james(a)xemacs.org> * x-font-menu.el (x-font-menu-font-data): Always pass a device as the 4th argument to x-font-menu-font-data-xft. xemacs-21.5 source patch: Diff command: cvs -q diff -uN Files affected: lisp/x-font-menu.el Index: lisp/x-font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v retrieving revision 1.16 diff -d -u -r1.16 x-font-menu.el --- lisp/x-font-menu.el 2006/04/25 14:01:54 1.16 +++ lisp/x-font-menu.el 2006/05/10 15:08:56 ＠＠ -270,7 +270,7 ＠＠ ;; #### this call to x-font-menu-font-data-core originally ;; had 4 args, and that's probably the right way to go (x-font-menu-font-data-core face dcache) - (x-font-menu-font-data-xft face dcache name domain)) + (x-font-menu-font-data-xft face dcache name (selected-device))) ;; #### this one, too (x-font-menu-font-data-core face dcache)))) -- 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] Autodetection of Latin-1 text with high-byte chars in a row 18 years, 7 months

Joachim Schrod

Hello, As discussed this morning on xemacs-beta, here is a patch to support Latin-1 encoded files that have several GR chars in a row. I couldn't test inference with Shift-JIS and BIG5 detection as I don't have test files with these encodings. Joachim src/ChangeLog addition: 2006-02-27 Joachim Schrod <jschrod(a)acm.org> * mule-coding.c (iso2022_detect): Handle Latin-1 encoded files that have several high-byte chars in a row. XEmacs 21.5 source patch: Diff command: cvs -q -f diff -b -u Files affected: src/mule-coding.c Index: src/mule-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mule-coding.c,v retrieving revision 1.36 diff -b -u -r1.36 mule-coding.c --- src/mule-coding.c 2005/11/22 07:19:32 1.36 +++ src/mule-coding.c 2006/02/27 21:30:53 ＠＠ -2927,7 +2927,20 ＠＠ } else if (data->odd_high_byte_groups > 0 && data->even_high_byte_groups > 0) + { + /* Well, this could be a Latin-1 text, with most high-byte + characters single, but sometimes two are together, though + this happens not as often. This is common for Western + European languages like German, French, Danish, Swedish, etc. + Then we would either have a rather small file and + even_high_byte_groups would be low. + Or we would have a larger file and the ratio of odd to even + groups would be very high. */ SET_DET_RESULTS (st, iso2022, DET_SOMEWHAT_UNLIKELY); + if (data->even_high_byte_groups <= 3 || + data->odd_high_byte_groups >= 10 * data->even_high_byte_groups) + DET_RESULT (st, iso_8_1) = DET_SOMEWHAT_LIKELY; + } else SET_DET_RESULTS (st, iso2022, DET_AS_LIKELY_AS_UNLIKELY); } -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Joachim Schrod Email: jschrod(a)acm.org Roedermark, Germany

2 participants
3 comments

AW: [AC21.5R21.4] Draft fix for metacity maximization bug 18 years, 7 months

Krueger, Wulf

Hi Stephen, > -----Ursprüngliche Nachricht----- > Von: Stephen J. Turnbull [mailto:stephen＠xemacs.org] > Gesendet: Samstag, 6. Mai 2006 19:48 > An: XEmacs Patches > Cc: xemacs-beta(a)xemacs.org; Peter Glassenbury (CSSE); Glynn > Clements; Kruger, Wulf; acs(a)xemacs.org > Betreff: [AC21.5R21.4] Draft fix for metacity maximization bug > > APPROVE COMMIT 21.5 RECOMMEND 21.4 Thanks! So far, that patch seems to have fixed the problems with KDE's kwin and Gnome's metacity. Compiz (Novell's combined composite/window manager for Xgl) still has some problems but it seems to be better now, too. It's so new that I wouldn't bother about that yet. Mit freundlichen Grüßen, Wulf C. Krüger ________________________________ T-Systems Systems Integration Project Center WPMS Solution & Service Center Business Enabling Solutions Global Competence Center T-Systems Enterprise Services GmbH Salzachstr. 4 - 12, 68199 Mannheim +49-621-8456-205 (Tel) E-Mail: wulf.krueger(a)t-systems.com Internet: http://www.t-systems.com ________________________________

1 participants
0 comments

[AC21.5] avoid leaking FontStructs 18 years, 7 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Not relevant to 21.4. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.957 diff -u -U0 -r1.957 ChangeLog --- src/ChangeLog 8 May 2006 07:35:23 -0000 1.957 +++ src/ChangeLog 9 May 2006 10:37:36 -0000 ＠＠ -0,0 +1,7 ＠＠ +2006-03-30 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_initialize_font_instance): + Ensure that duplicative X font gets freed if we have an Xft font. + Remove some redundant debug output. + Comment on frequency of calls to this function. + Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.39 diff -u -r1.39 objects-x.c --- src/objects-x.c 25 Apr 2006 14:02:09 -0000 1.39 +++ src/objects-x.c 9 May 2006 10:37:42 -0000 ＠＠ -309,6 +309,12 ＠＠ return 0; } + if (rf && fs) + { + XFreeFont (dpy, fs); + fs = NULL; /* we don' need no steenkin' X font */ + } + if (fs && !fs->max_bounds.width) { /* yes, this has been known to happen. */ ＠＠ -316,8 +322,7 ＠＠ fs = NULL; maybe_signal_error (Qgui_error, "X font is too small", f->name, Qfont, errb); - if (!rf) - return 0; + return 0; } /* Now that we're sure that we will succeed, we can allocate data without ＠＠ -353,11 +358,12 ＠＠ f->height = rf->height; f->proportional_p = 1; /* we can't recognize monospaced fonts! */ - DEBUG_XFT4 (0, "initialized metrics ascent %d descent %d width %d height %d\n", - f->ascent, f->descent, f->width, f->height); - /* we also output on initialization of any font below */ - DEBUG_XFT1 (2, "initialized Xft font %s\n", XSTRING_DATA(f->name)); - fs = NULL; /* we don' need no steenkin' X font */ + /* #### This message appears wa-a-ay too often! + We probably need to cache truenames or something? + Even if Xft does it for us, we cons too many font instances. */ + DEBUG_XFT4 (0, + "initialized metrics ascent %d descent %d width %d height %d\n", + f->ascent, f->descent, f->width, f->height); } else { -- 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches May 2006