HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New primitive secure-hash supporting md5, sha-1 and sha-2
[bpt/emacs.git]
/
src
/
w32reg.c
diff --git
a/src/w32reg.c
b/src/w32reg.c
index
56e3b42
..
e1465be
100644
(file)
--- a/
src/w32reg.c
+++ b/
src/w32reg.c
@@
-1,6
+1,5
@@
/* Emulate the X Resource Manager through the registry.
/* Emulate the X Resource Manager through the registry.
- Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1993-1994, 2001-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-20,12
+19,12
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Kevin Gallo */
#include <config.h>
/* Written by Kevin Gallo */
#include <config.h>
+#include <setjmp.h>
#include "lisp.h"
#include "w32term.h"
#include "blockinput.h"
#include <stdio.h>
#include "lisp.h"
#include "w32term.h"
#include "blockinput.h"
#include <stdio.h>
-#include <string.h>
#define REG_ROOT "SOFTWARE\\GNU\\Emacs"
#define REG_ROOT "SOFTWARE\\GNU\\Emacs"
@@
-57,9
+56,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
static char *
*/
static char *
-w32_get_rdb_resource (rdb, resource)
- char *rdb;
- char *resource;
+w32_get_rdb_resource (char *rdb, char *resource)
{
char *value = rdb;
int len = strlen (resource);
{
char *value = rdb;
int len = strlen (resource);
@@
-76,10
+73,8
@@
w32_get_rdb_resource (rdb, resource)
return NULL;
}
return NULL;
}
-LPBYTE
-w32_get_string_resource (name, class, dwexptype)
- char *name, *class;
- DWORD dwexptype;
+static LPBYTE
+w32_get_string_resource (char *name, char *class, DWORD dwexptype)
{
LPBYTE lpvalue = NULL;
HKEY hrootkey = NULL;
{
LPBYTE lpvalue = NULL;
HKEY hrootkey = NULL;
@@
-146,9
+141,7
@@
w32_get_string_resource (name, class, dwexptype)
database RDB. */
char *
database RDB. */
char *
-x_get_string_resource (rdb, name, class)
- XrmDatabase rdb;
- char *name, *class;
+x_get_string_resource (XrmDatabase rdb, char *name, char *class)
{
if (rdb)
{
{
if (rdb)
{
@@
-160,8
+153,10
@@
x_get_string_resource (rdb, name, class)
return resource;
}
return resource;
}
+ if (inhibit_x_resources)
+ /* --quick was passed, so this is a no-op. */
+ return NULL;
+
return (w32_get_string_resource (name, class, REG_SZ));
}
return (w32_get_string_resource (name, class, REG_SZ));
}
-/* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d
- (do not change this comment) */