diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xrdb.c | 36 |
2 files changed, 20 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 93a5ae1ad42..93ac28eb816 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -22,6 +22,8 @@ 2000-10-30 Stefan Monnier <monnier@cs.yale.edu> + * xrdb.c (x_load_resources): Use the class name in the defaults. + * regex.c (re_iswctype, re_wctype_to_bit): Fix braino. (regex_compile): Catch bogus \(\1\). diff --git a/src/xrdb.c b/src/xrdb.c index 830610945a1..ba6e660285c 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -542,37 +542,37 @@ x_load_resources (display, xrm_string, myname, myclass) will use some other default font. */ #ifdef USE_MOTIF - sprintf (line, "%s.pane.background: grey75", myname); + sprintf (line, "%s.pane.background: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fontList: %s", myname, helv); + sprintf (line, "%s*fontList: %s", myclass, helv); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*menu*background: grey75", myname); + sprintf (line, "%s*menu*background: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*menubar*background: grey75", myname, helv); + sprintf (line, "%s*menubar*background: grey75", myclass, helv); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*verticalScrollBar.background: grey75", myname); + sprintf (line, "%s*verticalScrollBar.background: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*verticalScrollBar.troughColor: grey75", myname); + sprintf (line, "%s*verticalScrollBar.troughColor: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s.dialog*.background: grey75", myname); + sprintf (line, "%s.dialog*.background: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb.Text.background: white", myname); + sprintf (line, "%s*fsb.Text.background: white", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb.FilterText.background: white", myname); + sprintf (line, "%s*fsb.FilterText.background: white", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb*DirList.background: white", myname); + sprintf (line, "%s*fsb*DirList.background: white", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb*ItemsList.background: white", myname); + sprintf (line, "%s*fsb*ItemsList.background: white", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb*background: grey75", myname); + sprintf (line, "%s*fsb*background: grey75", myclass); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb.Text.fontList: %s", myname, courier); + sprintf (line, "%s*fsb.Text.fontList: %s", myclass, courier); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb.FilterText.fontList: %s", myname, courier); + sprintf (line, "%s*fsb.FilterText.fontList: %s", myclass, courier); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb*ItemsList.fontList: %s", myname, courier); + sprintf (line, "%s*fsb*ItemsList.fontList: %s", myclass, courier); XrmPutLineResource (&rdb, line); - sprintf (line, "%s*fsb*DirList.fontList: %s", myname, courier); + sprintf (line, "%s*fsb*DirList.fontList: %s", myclass, courier); XrmPutLineResource (&rdb, line); /* Set double click time of list boxes in the file selection @@ -580,10 +580,10 @@ x_load_resources (display, xrm_string, myname, myclass) if (INTEGERP (Vdouble_click_time) && XINT (Vdouble_click_time) > 0) { sprintf (line, "%s*fsb*DirList.doubleClickInterval: %d", - myname, XFASTINT (Vdouble_click_time)); + myclass, XFASTINT (Vdouble_click_time)); XrmPutLineResource (&rdb, line); sprintf (line, "%s*fsb*ItemsList.doubleClickInterval: %d", - myname, XFASTINT (Vdouble_click_time)); + myclass, XFASTINT (Vdouble_click_time)); XrmPutLineResource (&rdb, line); } |