Mercurial > hg > xemacs-beta

changeset 1389:6355bae896e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-03-27 12:57:36 by stephent] use .Xresources not .Xdefaults <87adfhezt5.fsf@tleepslib.sk.tsukuba.ac.jp> regexp-tests fix
author stephent
date Thu, 27 Mar 2003 12:57:53 +0000
parents aa75c11622fc
children a7a5b4654e60
files ChangeLog PROBLEMS etc/ChangeLog etc/Emacs.ad etc/README etc/sample.Xdefaults lisp/ChangeLog lisp/menubar-items.el lisp/startup.el lwlib/ChangeLog lwlib/xlwscrollbar.c man/ChangeLog man/xemacs-faq.texi man/xemacs/frame.texi tests/ChangeLog tests/automated/regexp-tests.el
diffstat 16 files changed, 86 insertions(+), 351 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,3 +1,7 @@
+2003-03-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* PROBLEMS: Global substitution of .Xresources for .Xdefaults.
+
 2003-03-25  Jerry James  <james@eecs.ku.edu>
 
 	* configure.in: Add Andrew Begel's shared library support for
--- a/PROBLEMS	Wed Mar 26 22:52:32 2003 +0000
+++ b/PROBLEMS	Thu Mar 27 12:57:53 2003 +0000
@@ -990,7 +990,7 @@
 *** My X resources used to work, and now some of them are being ignored.
 
 Check the resources in .../etc/Emacs.ad (which is the same as the file
-sample.Xdefaults).  Perhaps some of the default resources built in to
+sample.Xresources).  Perhaps some of the default resources built in to
 emacs are now overriding your existing resources.  Copy and edit the
 resources in Emacs.ad as necessary.
 
@@ -1201,7 +1201,7 @@
 without optimization.  If that doesn't work, try recompiling with
 SYSTEM_MALLOC defined, and/or with REL_ALLOC undefined.
 
-*** A position you specified in .Xdefaults is ignored, using twm.
+*** A position you specified in .Xresources is ignored, using twm.
 
 twm normally ignores "program-specified" positions.
 You can tell it to obey them with this command in your `.twmrc' file:
@@ -1335,7 +1335,7 @@
 
 *** The popup menu appears at the bottom/right of my screen.
 
-You probably have something like the following in your ~/.Xdefaults
+You probably have something like the following in your ~/.Xresources
 
 	Emacs.geometry:		81x56--9--1
 
@@ -1382,7 +1382,7 @@
 ** AIX
 *** Your Delete key sends a Backspace to the terminal, using an AIXterm.
 
-The solution is to include in your .Xdefaults the lines:
+The solution is to include in your .Xresources the lines:
 
    *aixterm.Translations: #override <Key>BackSpace: string(0x7f)
    aixterm*ttyModes: erase ^?
--- a/etc/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/etc/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,3 +1,12 @@
+2003-03-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Emacs.ad: Global substition of .Xresources for .Xdefaults.
+	* sample.Xresources: Replaces sample.Xdefaults.
+	* sample.Xdefaults: Replace contents with pointer to
+	sample.Xresources.
+	* README: Change name of sample.Xdefaults to sample.Xresources.
+	Substitute 21.4 for 21.2.
+
 2003-03-03  Ville Skyttä  <scop@xemacs.org>
 
 	* BETA (New packages): Introduce Norbert Koch.
--- a/etc/Emacs.ad	Wed Mar 26 22:52:32 2003 +0000
+++ b/etc/Emacs.ad	Thu Mar 27 12:57:53 2003 +0000
@@ -1,6 +1,6 @@
 ! This is the app-defaults file for XEmacs.
 !
-! This used to be identical to sample.Xdefaults, but the resources
+! This used to be identical to sample.Xresources, but the resources
 ! below have been rewritten to be as general as possible to avoid
 ! overriding user resources.  Other than the form rewriting, both
 ! files should be kept in sync. 
@@ -12,7 +12,7 @@
 ! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
 ! (or whatever the standard app-defaults directory is at your site) to cause
 ! it to be consulted at run-time.  (Do this only for site-wide customizations:
-! personal customizations should be put into ~/.Xdefaults instead.)
+! personal customizations should be put into ~/.Xresources instead.)
 ! Note that the file must be named Emacs, not XEmacs.
 ! 
 ! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of
--- a/etc/README	Wed Mar 26 22:52:32 2003 +0000
+++ b/etc/README	Thu Mar 27 12:57:53 2003 +0000
@@ -21,11 +21,11 @@
 MACHINES		List of known machines configurations (OLD)
 MAILINGLISTS		List of available Mailing lists
 MORE.STUFF		List of useful unbundled packages
-NEWS			XEmacs 21.2 release information
+NEWS			XEmacs 21.4 release information
 ORDERS
 ORDERS.EUROPE
 ORDERS.JAPAN		Order forms for GNU software
-PACKAGES		List of packages available for 21.2 release
+PACKAGES		List of packages available for 21.4 release
 README			This file
 README.HYPERBOLE
 README.OO-BROWSER	How to obtain Hyperbole and the OO-Browser
@@ -60,7 +60,8 @@
 recycle2.xpm		Two versions of oversized Recycle cursor
 refcard.ps.gz		Postscript version of XEmacs reference card
 refcard.tex		XEmacs reference card
-sample.Xdefaults	Example ~/.Xdefaults file
+sample.Xdefaults	(legacy -- to be removed)
+sample.Xresources	Example ~/.Xresources file
 sample.init.el		Example ~/.xemacs/init.el file
 sink.xbm		A Gnu icon
 sparcworks/		Support files for Sparcworks
--- a/etc/sample.Xdefaults	Wed Mar 26 22:52:32 2003 +0000
+++ b/etc/sample.Xdefaults	Thu Mar 27 12:57:53 2003 +0000
@@ -1,300 +1,3 @@
-! This is a sample .Xdefaults file.  The resources below are the
-! actual resources used as defaults for XEmacs, although the
-! form of these resources in the XEmacs app-defaults file is
-! slightly different.
-! 
-! You can use the examples below as a basis for your own customizations:
-! copy and modify any of the resources below into your own ~/.Xdefaults file.
-! .Xdefaults specifies defaults for all applications, not just XEmacs; it is
-! normally used to customize fonts, colors, and the like, while ~/.emacs is
-! used to change other sorts of (XEmacs-specific) behavior.
-! 
-! In general, changes to your .Xdefaults file will not take effect until the
-! next time you restart the window system.  To reload your resources
-! explicitly, use the shell command
-! 
-! 	xrdb -load ~/.Xdefaults
-! 
-! The resources will take effect the next time you restart XEmacs.  (Simply
-! creating a new xemacs frame is not enough - you must restart the editor
-! for the changes to take effect.)
-! 
-
-
-! Colors and backgrounds.
-! ======================
-! The contrasts of these colors will cause them to map to the appropriate
-! one of "black" or "white" on monochrome systems.
-! 
-! The valid color names on your system can be found by looking in the file
-! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/.
-
-! Set the foreground and background colors of the `default' face.
-! The default face colors are the base for most of the other faces'
-! colors.  The default background is gray80, and the default foreground
-! is black.
-Emacs.default.attributeBackground:	gray80
-Emacs.default.attributeForeground:	black
-
-! Set the modeline colors.
-Emacs.modeline*attributeForeground:	Black
-Emacs.modeline*attributeBackground:	Gray75
-
-! Set the color of the text cursor.
-Emacs.text-cursor*attributeBackground:	Red3
-
-! If you want to set the color of the mouse pointer, do this:
-! Emacs.pointer*attributeForeground:	Black
-! If you want to set the background of the mouse pointer, do this:
-! Emacs.pointer*attributeBackground:	White
-! Note that by default, the pointer foreground and background are the same
-! as the default face.
-
-! Set the menubar colors.  This overrides the default foreground and
-! background colors specified above.
-Emacs*menubar*Foreground:		Gray30
-Emacs*menubar*Background:		Gray75
-! This is for buttons in the menubar.  
-! Yellow would be better, but that would map to white on monochrome.
-Emacs*menubar.buttonForeground:		Blue
-Emacs*XlwMenu.selectColor:		ForestGreen
-Emacs*XmToggleButton.selectColor:	ForestGreen
-
-! Specify the colors of popup menus.
-Emacs*popup*Foreground:			Black
-Emacs*popup*Background:			Gray75
-
-! Specify the colors of the various sub-widgets of the dialog boxes.
-Emacs*dialog*Foreground:		Black
-! #A5C0C1 is a shade of blue
-Emacs*dialog*Background:		#A5C0C1
-! The following three are for Motif dialog boxes ...
-Emacs*dialog*XmTextField*Background:	WhiteSmoke
-Emacs*dialog*XmText*Background:		WhiteSmoke
-Emacs*dialog*XmList*Background:		WhiteSmoke
-! While this one is for Athena dialog boxes.
-Emacs*dialog*Command*Background:	WhiteSmoke
-
-! Athena dialog boxes are sometimes built with the Xaw3d
-! variant of the Athena toolkit.
-! XEmacs being nice to 8bit displays, it defaults to:
-Emacs*dialog*Command*beNiceToColormap:	true
-! If you are shocked by the ugliness of the 3d rendition,
-! you may want to set (even on 8bit displays) the above to false.
-
-! Xlw Scrollbar colors
-Emacs*XlwScrollBar.Foreground:		Gray30
-Emacs*XlwScrollBar.Background:		Gray75
-Emacs*XmScrollBar.Foreground:		Gray30
-Emacs*XmScrollBar.Background:		Gray75
-
-!
-! The Lucid Scrollbar supports two added resources, SliderStyle is either
-! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
-! of the slider that depresses when the slider is clicked on.  ArrowPosition is
-! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
-! of the scrollbar, same puts both arrows at the same end, like the Amiga.
-!
-! Emacs*XlwScrollBar.SliderStyle:    dimple
-! Emacs*XlwScrollBar.ArrowPosition:  opposite
-
-
-!
-! If you want to turn off a toolbar, set its height or width to 0.
-! The correct size value is not really arbitrary.  We only control it
-! this way in order to avoid excess frame resizing when turning the
-! toolbars on and off.
-!
-! To change the heights and widths of the toolbars:
-!
-! Emacs.topToolBarHeight:		37
-! Emacs.bottomToolBarHeight:		0
-! Emacs.leftToolBarWidth:		0
-! Emacs.rightToolBarWidth:		0
-
-Emacs*topToolBarShadowColor:		Gray90
-Emacs*bottomToolBarShadowColor:		Gray40
-Emacs*backgroundToolBarColor:		Gray75
-Emacs*toolBarShadowThickness:		2
-
-
-! If you want to turn off vertical scrollbars, or change the default
-! pixel width of the vertical scrollbars, do it like this (0 width
-! means no vertical scrollbars):
-! 
-! Emacs.scrollBarWidth: 0
-! 
-! To change it for a particular frame, do this:
-! 
-! Emacs*FRAME-NAME.scrollBarWidth: 0
-
-
-! If you want to turn off horizontal scrollbars, or change the default
-! pixel height of the horizontal scrollbars, do it like this (0 height
-! means no horizontal scrollbars):
-! 
-! Emacs.scrollBarHeight: 0
-! 
-! To change it for a particular frame, do this:
-! 
-! Emacs*FRAME-NAME.scrollBarHeight: 0
-
-
-! To dynamically change the labels used for menubar buttons...
-! 
-! Emacs*XlwMenu.resourceLabels: True
-! Emacs*XlwMenu.newFrame.labelString: Open Another Window
-
-! To have the Motif scrollbars on the left instead of the right, do this:
-! 
-! Emacs*scrollBarPlacement: BOTTOM_LEFT
-!
-! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead
-
-! To have Motif scrollbars act more like Xt scrollbars...
-!
-! Emacs*XmScrollBar.translations: #override \n\
-!     <Btn1Down>:     PageDownOrRight(0)    \n\
-!     <Btn3Down>:     PageUpOrLeft(0)
-
-! Fonts.
-! ======
-! XEmacs requires the use of XLFD (X Logical Font Description) format font
-! names, which look like
-! 
-! 	*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
-! 
-! if you use any of the other, less strict font name formats, some of which
-! look like
-! 		lucidasanstypewriter-12
-! and		fixed
-! and		9x13
-! 
-! then XEmacs won't be able to guess the names of the bold and italic versions.
-! All X fonts can be referred to via XLFD-style names, so you should use those
-! forms.  See the man pages for X(1), xlsfonts(1), and xfontsel(1).
-
-
-! The default font for the text area of XEmacs is chosen at run-time
-! by lisp code which tries a number of different possibilities in order
-! of preference.  If you wish to override it, use this:
-! 
-! Emacs.default.attributeFont:  -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-
-! If you choose a font which does not have an italic version, you can specify
-! some other font to use for it here:
-! 
-! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
-! 
-! If you choose a font which does not have a bold-italic version,
-! you can specify some other font to use for it here:
-! 
-! Emacs.bold-italic.attributeFont:  -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-*
-! 
-! And here is how you would set the background color of the `highlight' face,
-! but only on the screen named `debugger':
-! 
-! Emacs*debugger.highlight.attributeBackground:		PaleTurquoise
-! 
-! See the NEWS file (C-h n) for a more complete description of the resource
-! syntax of faces.
-
-
-! Font of the modeline, menubar and pop-up menus.
-! Note that the menubar resources do not use the `face' syntax, since they
-! are X toolkit widgets and thus outside the domain of XEmacs proper.
-! 
-Emacs*menubar*Font: 		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*popup*Font:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-
-! Font in the Motif dialog boxes.
-! (Motif uses `fontList' while most other things use `font' - if you don't
-! know why you probably don't want to.)
-! 
-Emacs*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmTextField*FontList:	-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-
-! Font in the Athena dialog boxes.
-! I think 14-point looks nicer than 12-point.
-! Some people use 12-point anyway because you get more text, but
-! there's no purpose at all in doing this for dialog boxes.
-
-Emacs*Dialog*Font:		-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
-
-! Dialog box translations.
-! =======================
-
-! This accelerator binds <return> in a dialog box to <activate> on button1
-Emacs*dialog*button1.accelerators:#override\
-<KeyPress>Return: ArmAndActivate()\n\
-<KeyPress>KP_Enter: ArmAndActivate()\n\
-Ctrl<KeyPress>m: ArmAndActivate()\n
-
-! Translations to make the TextField widget behave more like XEmacs
-Emacs*XmTextField.translations: #override\n\
-	!<Key>osfBackSpace:	delete-previous-character()\n\
-	!<Key>osfDelete:	delete-previous-character()\n\
-	!Ctrl<Key>h: 		delete-previous-character()\n\
-	!Ctrl<Key>d: 		delete-next-character()\n\
-	!Meta<Key>osfDelete:	delete-previous-word()\n\
-	!Meta<Key>osfBackSpace:	delete-previous-word()\n\
-	!Meta<Key>d:		delete-next-word()\n\
-	!Ctrl<Key>k:		delete-to-end-of-line()\n\
-	!Ctrl<Key>g:		process-cancel()\n\
-	!Ctrl<Key>b:		backward-character()\n\
-	!<Key>osfLeft:		backward-character()\n\
-	!Ctrl<Key>f:		forward-character()\n\
-	!<Key>osfRight:		forward-character()\n\
-	!Meta<Key>b:		backward-word()\n\
-	!Meta<Key>osfLeft:	backward-word()\n\
-	!Meta<Key>f:		forward-word()\n\
-	!Meta<Key>osfRight:	forward-word()\n\
-	!Ctrl<Key>e:		end-of-line()\n\
-	!Ctrl<Key>a:		beginning-of-line()\n\
-	!Ctrl<Key>w:		cut-clipboard()\n\
-	!Meta<Key>w:		copy-clipboard()\n\
-	<Btn2Up>:		copy-primary()\n
-
-! With the XEmacs typeahead it's better to not have space be bound to
-! ArmAndActivate() for buttons that appear in dialog boxes.  This is
-! not 100% Motif compliant but the benefits far outweight the
-! compliancy problem.  
-Emacs*dialog*XmPushButton.translations:#override\n\
-    <Btn1Down>:         Arm()\n\
-    <Btn1Down>,<Btn1Up>: Activate()\
-			Disarm()\n\
-    <Btn1Down>(2+):     MultiArm()\n\
-    <Btn1Up>(2+):       MultiActivate()\n\
-    <Btn1Up>:           Activate()\
-		        Disarm()\n\
-    <Key>osfSelect:  	ArmAndActivate()\n\
-    <Key>osfActivate:   ArmAndActivate()\n\
-    <Key>osfHelp:	Help()\n\
-    ~Shift ~Meta ~Alt <Key>Return:	ArmAndActivate()\n\
-    <EnterWindow>:      Enter()\n\
-    <LeaveWindow>:      Leave()\n
-
-! XIM input method style 
-! ======================= 
-
-! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
-! order of user's preference.  
-! Choose a subset of the following styles or reorder to taste
-Emacs*ximStyles: XIMPreeditPosition|XIMStatusArea\
-            XIMPreeditPosition|XIMStatusNothing\
-            XIMPreeditPosition|XIMStatusNone\
-            XIMPreeditNothing|XIMStatusArea\
-            XIMPreeditNothing|XIMStatusNothing\
-            XIMPreeditNothing|XIMStatusNone\
-            XIMPreeditNone|XIMStatusArea\
-            XIMPreeditNone|XIMStatusNothing\
-            XIMPreeditNone|XIMStatusNone
-
-! XIM Preedit and Status foreground and background
-Emacs*EmacsFrame.ximForeground: black
-Emacs*EmacsFrame.ximBackground: white
-
-! XIM fontset (defaults to system fontset default)
-! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
+! This is a transitional placeholder file which will be removed for
+! the release.  See sample.Xresources for information about resource
+! specs for XEmacs.
--- a/lisp/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/lisp/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,3 +1,9 @@
+2003-03-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* menubar-items.el (default-menubar):
+	* startup.el (in comment): 
+	Global substitution: .Xresources for .Xdefaults.
+
 2003-03-24  Jerry James  <james@xemacs.org>
 
 	* window-xemacs.el (saved-window-equal): Use equal instead of = to
--- a/lisp/menubar-items.el	Wed Mar 26 22:52:32 2003 +0000
+++ b/lisp/menubar-items.el	Thu Mar 27 12:57:53 2003 +0000
@@ -1654,10 +1654,10 @@
 	(Help-find-file (locate-data-file "sample.gtkrc"))
 	:included (featurep 'gtk)
 	:active (locate-data-file "sample.gtkrc")]
-       ["View Sample .%_Xdefaults"
-	(Help-find-file (locate-data-file "sample.Xdefaults"))
+       ["View Sample .%_Xresources"
+	(Help-find-file (locate-data-file "sample.Xresources"))
 	:included (featurep 'x)
-	:active (locate-data-file "sample.Xdefaults")]
+	:active (locate-data-file "sample.Xresources")]
        ["View Sample %_enriched.doc"
 	(Help-find-file (locate-data-file "enriched.doc"))
 	:active (locate-data-file "enriched.doc")])
--- a/lisp/startup.el	Wed Mar 26 22:52:32 2003 +0000
+++ b/lisp/startup.el	Thu Mar 27 12:57:53 2003 +0000
@@ -1337,7 +1337,7 @@
 ;;    (insert "For customization examples, see the files ")
 ;;    (funcall present-file "sample.emacs")
 ;;    (insert " and ")
-;;    (funcall present-file "sample.Xdefaults")
+;;    (funcall present-file "sample.Xresources")
 ;;    (insert (format "\nin the directory %s." data-directory)))
 
 (defun startup-set-invocation-environment ()
--- a/lwlib/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/lwlib/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,3 +1,7 @@
+2003-03-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xlwscrollbar.c: Global substitution of .Xresources for .Xdefaults.
+
 2003-02-28  Ben Wing  <ben@xemacs.org>
 
 	* lwlib-Xm.c:
--- a/lwlib/xlwscrollbar.c	Wed Mar 26 22:52:32 2003 +0000
+++ b/lwlib/xlwscrollbar.c	Thu Mar 27 12:57:53 2003 +0000
@@ -26,7 +26,7 @@
  * Athena-style scrollbar button bindings added on Sun Dec 24 22:03:57 1995
  * by Jonathan Stigelman <Stig@hackvan.com>...   Ho ho ho!
  *
- * To use them, put this resource in your .Xdefaults
+ * To use them, put this resource in your .Xresources
  *
  * Emacs*XlwScrollBar.translations: #override \n\
  *   <Btn1Down>:     PageDownOrRight()	  \n\
--- a/man/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/man/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,13 +1,13 @@
-2003-03-26  Stephen J. Turnbull  <stephen@xemacs.org>
+2003-03-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs/frame.texi (XEmacs under X):
+	* xemacs-faq.texi:
+	Global substitute .Xresources for .Xdefaults.
 
 	* xemacs-faq.texi (Q3.2.2): `default' is also a face.
 	(Q3.2.2, Q3.8.4): Describe appropriate use of `fontSet' in Mule.
         Suggested by Janis Dzerins <jonis@dir.lv>.
 
-2003-03-26  Stephen J. Turnbull  <stephen@xemacs.org>
-
-	* xemacs-faq.texi: Global substitute .Xresources for .Xdefaults.
-
 2003-03-20  Steve Youngs  <youngs@xemacs.org>
 
 	* xemacs/packages.texi (Automatically): Refer to
--- a/man/xemacs-faq.texi	Wed Mar 26 22:52:32 2003 +0000
+++ b/man/xemacs-faq.texi	Thu Mar 27 12:57:53 2003 +0000
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/03/26 06:10:47 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/03/27 12:57:48 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -2827,13 +2827,13 @@
 Search through the @file{NEWS} file for @samp{X Resources}.  A fairly
 comprehensive list is given after it.
 
-In addition, an @file{app-defaults} file is supplied,
-@file{etc/Emacs.ad} listing the defaults.  The file
-@file{etc/sample.Xresources} gives a set of defaults that you might
-consider.  It is essentially the same as @file{etc/Emacs.ad} but some
-entries are slightly altered.  Be careful about installing the contents
-of this file into your @file{.Xresources} or @file{.Xresources} file if
-you use GNU Emacs under X11 as well.
+In addition, an @file{app-defaults} file @file{etc/Emacs.ad} is
+supplied, listing the defaults.  The file @file{etc/sample.Xresources}
+gives a different set of defaults that you might consider for
+installation in your @file{~/.Xresources} file.  It is nearly the same
+as @file{etc/Emacs.ad}, but a few entries are altered.  Be careful about
+installing the contents of this file into your @file{.Xresources} (or
+legacy @file{.Xdefaults}) file if you use GNU Emacs under X11 as well.
 
 @node Q3.1.2, Q3.1.3, Q3.1.1, Customization
 @unnumberedsubsec Q3.1.2: How can I detect a color display?
@@ -3002,14 +3002,16 @@
 Emacs.modeline.attributeFont: fixed
 @end example
 
-This is confusing because @samp{default} and @samp{modeline} faces, and
-can be found listed with all faces in the current mode by using
-@kbd{M-x set-face-font (enter) ?}.  They use the face-specific resource
-@samp{attributeFont}, while menubar is a normal X thing that uses the
-specification @samp{font}.  With Motif it @emph{may be} necessary to use
-@samp{fontList} instead of @samp{font}.  With Mule in non-Motif
-configurations it @emph{is} necessary to use @samp{fontSet} instead of
-@samp{font}.
+This is confusing because @samp{default} and @samp{modeline} are face
+names, and can be found listed with all faces in the current mode by
+using @kbd{M-x set-face-font (enter) ?}.  They use the face-specific
+resource @samp{attributeFont}
+
+On the other hand, @samp{menubar} is a normal X thing that uses the
+resource @samp{font}.  With Motif it @emph{may be} necessary to use
+@samp{fontList} @emph{instead of} @samp{font}.  In @emph{non-Motif}
+configurations with Mule it @emph{is} necessary to use @samp{fontSet}
+instead of @samp{font}.  (Sorry, there just is no simple recipe here.)
 
 @node Q3.2.3, Q3.2.4, Q3.2.2, Customization
 @unnumberedsubsec Q3.2.3: How can I set the colors when highlighting a region?
@@ -3780,11 +3782,11 @@
 Emacs*menubar*fontList: FONT
 @end example
 
-If you are using the Lucid menubar, for backward compatibility of user
-configurations, the @samp{font} resource is recognized.  Since this is
-not supported by Motif itself, the code is a kludge and the @samp{font}
-resource will be recognized only if the @samp{fontList} resource
-resource is unset.  This means that the resource
+If you are using the Lucid menubar, for backward compatibility with
+existing user configurations, the @samp{font} resource is recognized.
+Since this is not supported by Motif itself, the code is a kludge and
+the @samp{font} resource will be recognized only if the @samp{fontList}
+resource resource is unset.  This means that the resource
 
 @example
 *fontList: FONT
@@ -3798,9 +3800,11 @@
 
 even though the latter is more specific.
 
-With Mule in non-Motif configurations it @emph{is} necessary to use
-@code{fontSet} @emph{instead of} @code{font}; the backward compatibility
-kludge was never implemented for non-Motif builds.  Example:
+In non-Motif configurations using @samp{--with-mule} and
+@samp{--with-xfs} it @emph{is} necessary to use the @code{fontSet}
+resource @emph{instead of} the @code{font} resource.  The backward
+compatibility kludge was never implemented for non-Motif builds.
+Example:
 
 @example
 *fontSet: FONT
--- a/man/xemacs/frame.texi	Wed Mar 26 22:52:32 2003 +0000
+++ b/man/xemacs/frame.texi	Thu Mar 27 12:57:53 2003 +0000
@@ -310,7 +310,7 @@
 extreme right is the @samp{Help} menu, which should always be
 available.  It provides access to all the XEmacs help facilities
 available through @kbd{C-h}, as well as samples of various configuration
-files like @samp{~/.Xdefaults} and @samp{~/.emacs}.  At the extreme left
+files like @samp{~/.Xresources} and @samp{~/.emacs}.  At the extreme left
 is the @samp{Files} menu, which provides the usual file reading,
 writing, and printing operations, as well as operations like revert
 buffer from most recent save.  The next menu from the left is the
@@ -531,7 +531,7 @@
 For values specific to the first XEmacs frame, you must use X resources.
 The variable @code{x-frame-defaults} takes an alist of default frame
 creation parameters for X window frames.  These override what is
-specified in @file{~/.Xdefaults} but are overridden by the arguments to
+specified in @file{~/.Xresources} but are overridden by the arguments to
 the particular call to @code{x-create-frame}.
 
 @vindex create-frame-hook
--- a/tests/ChangeLog	Wed Mar 26 22:52:32 2003 +0000
+++ b/tests/ChangeLog	Thu Mar 27 12:57:53 2003 +0000
@@ -1,3 +1,7 @@
+2003-03-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/regexp-tests.el: Change known-bug status of "\\b".
+
 2003-02-21  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* automated/mule-tests.el (charsets-in-string):
--- a/tests/automated/regexp-tests.el	Wed Mar 26 22:52:32 2003 +0000
+++ b/tests/automated/regexp-tests.el	Thu Mar 27 12:57:53 2003 +0000
@@ -249,12 +249,12 @@
 (Assert (not (string-match "\\> " " ")))
 (Assert (not (string-match "a\\<" "a")))
 (Assert (not (string-match "\\>a" "a")))
-;; Added Known-Bug 2002-09-09
-(Known-Bug-Expect-Failure
- (Assert (not (string-match "\\b" "")))
- (Assert (not (string-match "\\b" " ")))
- (Assert (not (string-match " \\b" " ")))
- (Assert (not (string-match "\\b " " "))))
+;; Added Known-Bug 2002-09-09 sjt
+;; Fixed bug 2003-03-21 sjt
+(Assert (not (string-match "\\b" "")))
+(Assert (not (string-match "\\b" " ")))
+(Assert (not (string-match " \\b" " ")))
+(Assert (not (string-match "\\b " " ")))
 
 ;; Character classes are broken in Mule as of 21.5.9
 ;; Added Known-Bug 2002-12-27