User: stephent Date: 05/11/26 19:49:14 Modified: xemacs configure configure.ac ChangeLog Log: Change Xft default to OFF. <87d5kn2qkw.fsf_-_(a)tleepslib.sk.tsukuba.ac.jp&gt; Revision Changes Path 1.264 +11 -11 XEmacs/xemacs/configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.263 retrieving revision 1.264 diff -u -p -r1.263 -r1.264 --- configure 2005/11/26 18:24:51 1.263 +++ configure 2005/11/26 18:49:06 1.264 ＠＠ -996,8 +996,8 ＠＠ Window-system options Xft are `emacs' (buffers), `menubars', `tabs', and `gauges'. Prefix component with `no' to disable its use of Xft. Requires X11, Xft, Xrender, freetype, - and fontconfig support. Default is - `emacs,menubars,tabs,gauges'. + and fontconfig support. Default is `noemacs, + nomenubars, notabs, nogauges'. --with-gtk Support GTK on the X Window System. (EXPERIMENTAL) --with-gnome Support GNOME on the X Window System. (EXPERIMENTAL) --with-msw Support MS Windows as a window system (only under ＠＠ -2264,17 +2264,17 ＠＠ _ACEOF fi; _xft_notfirst="" -with_xft_emacs=yes -enable_xft_emacs=yes -with_xft_menubars=yes -enable_xft_menubars=yes -with_xft_tabs=yes -enable_xft_tabs=yes -with_xft_gauges=yes -enable_xft_gauges=yes +with_xft_emacs=no +enable_xft_emacs=no +with_xft_menubars=no +enable_xft_menubars=no +with_xft_tabs=no +enable_xft_tabs=no +with_xft_gauges=no +enable_xft_gauges=no _xft_types="emacs menubars tabs gauges" -_xft_default="emacs,menubars,tabs,gauges" +_xft_default="noemacs,nomenubars,notabs,nogauges" 1.25 +5 -5 XEmacs/xemacs/configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- configure.ac 2005/11/26 18:24:54 1.24 +++ configure.ac 2005/11/26 18:49:09 1.25 ＠＠ -637,12 +637,12 ＠＠ XE_COMPLEX_ARG([xft], [Xft], [`emacs' (buffers), `menubars', `tabs', and `gauges'], [X11, Xft, Xrender, freetype, and fontconfig], - [`emacs,menubars,tabs,gauges'])], + [`noemacs, nomenubars, notabs, nogauges'])], [],[], - [XE_COMPLEX_OPTION([emacs],[yes]), - XE_COMPLEX_OPTION([menubars],[yes]), - XE_COMPLEX_OPTION([tabs],[yes]), - XE_COMPLEX_OPTION([gauges],[yes])]) + [XE_COMPLEX_OPTION([emacs],[no]), + XE_COMPLEX_OPTION([menubars],[no]), + XE_COMPLEX_OPTION([tabs],[no]), + XE_COMPLEX_OPTION([gauges],[no])]) XE_MERGED_ARG([gtk], AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]), [true], [with_gtk=no]) 1.476 +5 -0 XEmacs/xemacs/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.475 retrieving revision 1.476 diff -u -p -r1.475 -r1.476 --- ChangeLog 2005/11/26 18:24:51 1.475 +++ ChangeLog 2005/11/26 18:49:10 1.476 ＠＠ -1,5 +1,10 ＠＠ 2005-11-27 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * configure.ac (XE_COMPLEX_ARG[xft]): Default everything off; + change doc. + +2005-11-27 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + * configure.ac (XE_COMPLEX_ARG[xft]): Remove merge detritus and regenerate configure to fix syntax error.