diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-05-02 07:51:29 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-05-02 07:51:29 +0000 |
| commit | ad8f1c5b7bc8a515342ae7453a87347ce7550bf2 (patch) | |
| tree | 3dd8cbaa0f8276e46d42f7192bff28c58f9656b2 /src | |
| parent | 854bc5d92a8352ba022821c1822a843778882282 (diff) | |
| download | emacs-ad8f1c5b7bc8a515342ae7453a87347ce7550bf2.tar.gz | |
Finish downcasing mouse_init1, mouse_off,
mouse_check_moved, mouse_pressed, mouse_released, mouse_on, mouse_init.
(Fmode25, Fmode4350): Clean up the coding and return a well-defined value.
(syms_of_dosfns): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dosfns.c | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/src/dosfns.c b/src/dosfns.c index 60ed6ae7f07..3eeb08c1c9c 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -34,20 +34,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "dosfns.h" #include "msdos.h" -static void -mode_resetsize () -{ - Fset_screen_width (ScreenCols (), Qnil); - Fset_screen_height (ScreenRows (), Qnil); -} - -DEFUN ("mode25", Fmode25, Smode25, 0, 0, "", - "Set the number of rows to 25.") +DEFUN ("mode25", Fmode25, Smode25, 0, 0, "", "\ +Changes the number of rows to 25.") () { union REGS regs; - if (have_mouse) Mouse_off (); +#ifdef HAVE_X_WINDOWS + if (!inhibit_window_system) + return Qnil; +#endif + if (have_mouse) mouse_off (); regs.x.ax = 3; int86 (0x10, ®s, ®s); regs.x.ax = 0x1101; @@ -58,19 +55,24 @@ DEFUN ("mode25", Fmode25, Smode25, 0, 0, "", int86 (0x10, ®s, ®s); regs.x.ax = 3; int86 (0x10, ®s, ®s); - mode_resetsize (); + Fset_frame_size (Fselected_frame (), ScreenCols (), ScreenRows ()); Frecenter (Qnil); Fredraw_display (); - if (have_mouse) Mouse_init (); + if (have_mouse) mouse_init (); + return Qnil; } -DEFUN ("mode4350", Fmode4350, Smode4350, 0, 0, "", - "Set the number of rows to 43 (EGA) or 50 (VGA).") +DEFUN ("mode4350", Fmode4350, Smode4350, 0, 0, "", "\ +Changes the number of rows to 43 (EGA) or 50 (VGA).") () { union REGS regs; - if (have_mouse) Mouse_off (); +#ifdef HAVE_X_WINDOWS + if (!inhibit_window_system) + return Qnil; +#endif + if (have_mouse) mouse_off (); regs.x.ax = 3; int86 (0x10, ®s, ®s); regs.x.ax = 0x1112; @@ -82,10 +84,11 @@ DEFUN ("mode4350", Fmode4350, Smode4350, 0, 0, "", regs.x.ax = 0x0100; regs.x.cx = 7; int86 (0x10, ®s, ®s); - mode_resetsize (); + Fset_frame_size (Fselected_frame (), ScreenCols (), ScreenRows ()); Frecenter (Qnil); Fredraw_display (); - if (have_mouse) Mouse_init (); + if (have_mouse) mouse_init (); + return Qnil; } DEFUN ("int86", Fint86, Sint86, 2, 2, 0, @@ -199,14 +202,14 @@ Usually this is the international telephone prefix."); DEFVAR_INT ("dos-codepage", &dos_codepage, "The codepage active when Emacs was started.\n\ -The following are known: - 437 US - 850 Multilingual - 852 Slavic/Latin II - 857 Turkish - 860 Portugal - 861 Iceland - 863 Canada (French) +The following are known:\n\ + 437 United States\n\ + 850 Multilingual (Latin I)\n\ + 852 Slavic (Latin II)\n\ + 857 Turkish\n\ + 860 Portugal\n\ + 861 Iceland\n\ + 863 Canada (French)\n\ 865 Norway/Denmark"); DEFVAR_LISP ("dos-version", &Vdos_version, |