comparison src/xrdb.c @ 88155:d7ddb3e565de

sync with trunk
author Henrik Enberg <henrik.enberg@telia.com>
date Mon, 16 Jan 2006 00:03:54 +0000
parents e26d9755d4e8
children
comparison
equal deleted inserted replaced
88154:8ce476d3ba36 88155:d7ddb3e565de
1 /* Deal with the X Resource Manager. 1 /* Deal with the X Resource Manager.
2 Copyright (C) 1990, 1993, 1994, 2000, 2001 Free Software Foundation. 2 Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
3 2005 Free Software Foundation, Inc.
3 4
4 This file is part of GNU Emacs. 5 This file is part of GNU Emacs.
5 6
6 GNU Emacs is free software; you can redistribute it and/or modify 7 GNU Emacs is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 15 GNU General Public License for more details.
15 16
16 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
17 along with GNU Emacs; see the file COPYING. If not, write to 18 along with GNU Emacs; see the file COPYING. If not, write to
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 Boston, MA 02111-1307, USA. */ 20 Boston, MA 02110-1301, USA. */
20 21
21 /* Written by jla, 4/90 */ 22 /* Written by jla, 4/90 */
22 23
23 #ifdef emacs 24 #ifdef emacs
24 #include <config.h> 25 #include <config.h>
51 #include <X11/Xos.h> 52 #include <X11/Xos.h>
52 #endif 53 #endif
53 #include <X11/X.h> 54 #include <X11/X.h>
54 #include <X11/Xutil.h> 55 #include <X11/Xutil.h>
55 #include <X11/Xresource.h> 56 #include <X11/Xresource.h>
56 #ifdef VMS 57 #ifdef HAVE_PWD_H
57 #include "vms-pwd.h"
58 #else
59 #include <pwd.h> 58 #include <pwd.h>
60 #endif 59 #endif
61 #include <sys/stat.h> 60 #include <sys/stat.h>
62 61
63 #if !defined(S_ISDIR) && defined(S_IFDIR) 62 #if !defined(S_ISDIR) && defined(S_IFDIR)
525 { 524 {
526 XrmDatabase user_database; 525 XrmDatabase user_database;
527 XrmDatabase rdb; 526 XrmDatabase rdb;
528 XrmDatabase db; 527 XrmDatabase db;
529 char line[256]; 528 char line[256];
529
530 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; 530 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
531
531 #ifdef USE_MOTIF 532 #ifdef USE_MOTIF
532 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; 533 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
533 extern Lisp_Object Vdouble_click_time; 534 extern Lisp_Object Vdouble_click_time;
534 #endif 535 #endif
535 536
810 printf ("\tExit.\n\n"); 811 printf ("\tExit.\n\n");
811 812
812 XCloseDisplay (display); 813 XCloseDisplay (display);
813 } 814 }
814 #endif /* TESTRM */ 815 #endif /* TESTRM */
816
817 /* arch-tag: 37e6fbab-ed05-4363-9e76-6c4109ed511f
818 (do not change this comment) */