diff options
| author | Glenn Morris | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /src/w32term.c | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
| download | emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip | |
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32term.c b/src/w32term.c index 692130b5140..67e853f21f0 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -5941,7 +5941,7 @@ w32_initialize_display_info (Lisp_Object display_name) | |||
| 5941 | 5941 | ||
| 5942 | } | 5942 | } |
| 5943 | 5943 | ||
| 5944 | /* Create an xrdb-style database of resources to supercede registry settings. | 5944 | /* Create an xrdb-style database of resources to supersede registry settings. |
| 5945 | The database is just a concatenation of C strings, finished by an additional | 5945 | The database is just a concatenation of C strings, finished by an additional |
| 5946 | \0. The strings are submitted to some basic normalization, so | 5946 | \0. The strings are submitted to some basic normalization, so |
| 5947 | 5947 | ||