aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2007-09-13 22:25:13 +0000
committerJason Rumney2007-09-13 22:25:13 +0000
commit09b69f0142c0e8f5edaa98a6f4f3a6f9520ba74b (patch)
tree352a2e6cb751886145ebbb55c0c4eb13f4b87f1a /src
parent9c7c716d87ef787bd192c71879109678c9bb9946 (diff)
downloademacs-09b69f0142c0e8f5edaa98a6f4f3a6f9520ba74b.tar.gz
emacs-09b69f0142c0e8f5edaa98a6f4f3a6f9520ba74b.zip
(w32_term_init): Pass rif to w32_init_fringe.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/w32term.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 25e30ab082c..2e4a32f4c93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12007-09-13 Jason Rumney <jasonr@gnu.org>
2
3 * fringe.c (w32_init_fringe, mac_init_fringe): Add rif argument.
4
5 * w32term.c (w32_term_init): Pass rif to w32_init_fringe.
6
7 * macterm.c (mac_initialize): Don't call mac_init_fringe here.
8 (mac_term_init): Call here instead, passing rif.
9
12007-09-13 Glenn Morris <rgm@gnu.org> 102007-09-13 Glenn Morris <rgm@gnu.org>
2 11
3 * s/hpux.h: No longer define `static' as nothing. 12 * s/hpux.h: No longer define `static' as nothing.
diff --git a/src/w32term.c b/src/w32term.c
index 2e3860b6637..e8d8cee7da7 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6412,7 +6412,7 @@ w32_term_init (display_name, xrm_option, resource_name)
6412 horizontally reflected compared to how they appear on X, so we 6412 horizontally reflected compared to how they appear on X, so we
6413 need to bitswap and convert to unsigned shorts before creating 6413 need to bitswap and convert to unsigned shorts before creating
6414 the bitmaps. */ 6414 the bitmaps. */
6415 w32_init_fringe (); 6415 w32_init_fringe (terminal->rif);
6416 6416
6417#ifndef F_SETOWN_BUG 6417#ifndef F_SETOWN_BUG
6418#ifdef F_SETOWN 6418#ifdef F_SETOWN