Revision: sxemacs--schme--22.1.10--patch-1
Archive: marcus@xxxxxxxxxxxxxxxxx
Creator: Marcus Eskilsson <marcus@xxxxxxxxxxx>
Date: Sat Jun 7 00:31:51 CEST 2008
Standard-date: 2008-06-06 22:31:51 GMT
Removed-files: src/.arch-ids/gui-msw.c.id src/gui-msw.c
Modified-files: src/cmdloop.c src/console.c src/faces.c
src/gutter.c src/print.c src/redisplay.c src/toolbar.c
src/window.c
New-patches: marcus@xxxxxxxxxxxxxxxxx/sxemacs--schme--22.1.10--patch-1
Summary: Removal of Microsoft litter
Keywords: cleansing
* Remove src/gui-msw.c
* Remove the Microsoft related #ifdefs littering the code
* removed files
src/.arch-ids/gui-msw.c.id
src/gui-msw.c
* added files
{arch}/sxemacs/sxemacs--schme/sxemacs--schme--22.1.10/marcus@xxxxxxxxxxxxxxxxx/patch-log/patch-1
* modified files
--- orig/src/cmdloop.c
+++ mod/src/cmdloop.c
@@ -119,10 +119,6 @@
stderr_out("*** Backtrace\n");
Fbacktrace(Qexternal_debugging_output, Qt);
stderr_out("*** Killing SXEmacs\n");
-#ifdef HAVE_MS_WINDOWS
- Fmswindows_message_box(build_string("Initialization error"),
- Qnil, Qnil);
-#endif
return Fkill_emacs(make_int(-1));
}
--- orig/src/console.c
+++ mod/src/console.c
@@ -240,11 +240,6 @@
Vwindow_system = Qgtk;
else
#endif
-#ifdef HAVE_MS_WINDOWS
- if (CONSOLE_MSWINDOWS_P(XCONSOLE(console)))
- Vwindow_system = Qmswindows;
- else
-#endif
Vwindow_system = Qnil;
}
--- orig/src/faces.c
+++ mod/src/faces.c
@@ -1875,12 +1875,6 @@
fg_fb = acons(list1(Qtty), Fvector(0, 0), fg_fb);
bg_fb = acons(list1(Qtty), Fvector(0, 0), bg_fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fg_fb = acons(list1(Qmsprinter), build_string("black"), fg_fb);
- bg_fb = acons(list1(Qmsprinter), build_string("white"), bg_fb);
- fg_fb = acons(list1(Qmswindows), build_string("black"), fg_fb);
- bg_fb = acons(list1(Qmswindows), build_string("white"), bg_fb);
-#endif
set_specifier_fallback(Fget(Vdefault_face, Qforeground, Qnil),
fg_fb);
set_specifier_fallback(Fget(Vdefault_face, Qbackground, Qnil),
@@ -1944,33 +1938,6 @@
inst_list = Fcons(Fcons(list1(Qtty), build_string("normal")),
inst_list);
#endif /* HAVE_TTY */
-#ifdef HAVE_MS_WINDOWS
- /* Fixedsys does not exist for printers */
- inst_list = Fcons(Fcons(list1(Qmsprinter),
- build_string
- ("Courier:Regular:10::Western")),
- inst_list);
- inst_list =
- Fcons(Fcons
- (list1(Qmsprinter),
- build_string("Courier New:Regular:10::Western")),
- inst_list);
-
- inst_list = Fcons(Fcons(list1(Qmswindows),
- build_string
- ("Fixedsys:Regular:9::Western")),
- inst_list);
- inst_list =
- Fcons(Fcons
- (list1(Qmswindows),
- build_string("Courier:Regular:10::Western")),
- inst_list);
- inst_list =
- Fcons(Fcons
- (list1(Qmswindows),
- build_string("Courier New:Regular:10::Western")),
- inst_list);
-#endif /* HAVE_MS_WINDOWS */
set_specifier_fallback(Fget(Vdefault_face, Qfont, Qnil),
inst_list);
}
@@ -2013,12 +1980,6 @@
fg_fb = acons(list1(Qtty), Fvector(0, 0), fg_fb);
bg_fb = acons(list1(Qtty), Fvector(0, 0), bg_fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fg_fb = acons(list1(Qmsprinter), build_string("black"), fg_fb);
- bg_fb = acons(list1(Qmsprinter), build_string("white"), bg_fb);
- fg_fb = acons(list1(Qmswindows), build_string("black"), fg_fb);
- bg_fb = acons(list1(Qmswindows), build_string("Gray75"), bg_fb);
-#endif
set_specifier_fallback(Fget
(Vgui_element_face, Qforeground, Qnil),
fg_fb);
--- orig/src/gutter.c
+++ mod/src/gutter.c
@@ -1328,10 +1328,6 @@
#ifdef HAVE_X_WINDOWS
fb = Fcons(Fcons(list1(Qx), Qautodetect), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmsprinter), Qautodetect), fb);
- fb = Fcons(Fcons(list1(Qmswindows), Qautodetect), fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_gutter_height, fb);
@@ -1345,10 +1341,6 @@
#ifdef HAVE_GTK
fb = Fcons(Fcons(list1(Qgtk), Qautodetect), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmsprinter), Qautodetect), fb);
- fb = Fcons(Fcons(list1(Qmswindows), Qautodetect), fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_gutter_width, fb);
@@ -1434,12 +1426,6 @@
#ifdef HAVE_X_WINDOWS
fb = Fcons(Fcons(list1(Qx), make_int(DEFAULT_GUTTER_BORDER_WIDTH)), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmsprinter), Qzero), fb);
- fb = Fcons(Fcons
- (list1(Qmswindows), make_int(DEFAULT_GUTTER_BORDER_WIDTH)),
- fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_gutter_border_width, fb);
--- orig/src/print.c
+++ mod/src/print.c
@@ -50,10 +50,6 @@
for the convenience of the debugger. */
Lisp_Object Qexternal_debugging_output, Qalternate_debugging_output;
-#ifdef HAVE_MS_WINDOWS
-Lisp_Object Qmswindows_debugging_output;
-#endif
-
/* Avoid actual stack overflow in print. */
static int print_depth;
@@ -1854,9 +1850,6 @@
DEFSUBR(Fopen_termscript);
defsymbol(&Qexternal_debugging_output, "external-debugging-output");
defsymbol(&Qalternate_debugging_output, "alternate-debugging-output");
-#ifdef HAVE_MS_WINDOWS
- defsymbol(&Qmswindows_debugging_output, "mswindows-debugging-output");
-#endif
DEFSUBR(Fwith_output_to_temp_buffer);
}
--- orig/src/redisplay.c
+++ mod/src/redisplay.c
@@ -8985,15 +8985,6 @@
}
#endif
-#ifdef HAVE_MS_WINDOWS
- if (!strcmp(display_use, "mswindows")) {
- /* Some stuff checks this way early. */
- Vwindow_system = Qmswindows;
- Vinitial_window_system = Qmswindows;
- return;
- }
-#endif /* HAVE_MS_WINDOWS */
-
#ifdef HAVE_TTY
/* If no window system has been specified, try to use the terminal. */
if (!isatty(0)) {
--- orig/src/toolbar.c
+++ mod/src/toolbar.c
@@ -1555,10 +1555,6 @@
#ifdef HAVE_X_WINDOWS
fb = Fcons(Fcons(list1(Qx), make_int(DEFAULT_TOOLBAR_HEIGHT)), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmswindows),
- make_int(MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_toolbar_height, fb);
@@ -1572,10 +1568,6 @@
#ifdef HAVE_X_WINDOWS
fb = Fcons(Fcons(list1(Qx), make_int(DEFAULT_TOOLBAR_WIDTH)), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmswindows),
- make_int(MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_toolbar_width, fb);
@@ -1688,11 +1680,6 @@
fb = Fcons(Fcons(list1(Qgtk), make_int(DEFAULT_TOOLBAR_BORDER_WIDTH)),
fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons
- (list1(Qmswindows),
- make_int(MSWINDOWS_DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
-#endif
if (!NILP(fb))
set_specifier_fallback(Vdefault_toolbar_border_width, fb);
--- orig/src/window.c
+++ mod/src/window.c
@@ -6372,10 +6372,6 @@
#ifdef HAVE_X_WINDOWS
fb = Fcons(Fcons(list1(Qx), make_int(3)), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- /* #### This should be made magic and made to obey system
settings */
- fb = Fcons(Fcons(list1(Qmswindows), make_int(3)), fb);
-#endif
set_specifier_fallback(Vvertical_divider_line_width, fb);
}
set_specifier_caching(Vvertical_divider_line_width,
@@ -6405,9 +6401,6 @@
#ifdef HAVE_GTK
fb = Fcons(Fcons(list1(Qgtk), Qzero), fb);
#endif
-#ifdef HAVE_MS_WINDOWS
- fb = Fcons(Fcons(list1(Qmswindows), Qzero), fb);
-#endif
set_specifier_fallback(Vvertical_divider_spacing, fb);
}
set_specifier_caching(Vvertical_divider_spacing,
|