aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2022-07-09 13:05:49 +0200
committerStefan Kangas2022-09-09 11:27:30 +0200
commitea0b913ab64c872b169a4b9dfd3e4699cb1fd637 (patch)
tree1fda49d1bc2cf5c0d7f360469e465edec2e5434c /src
parent1f29ee2d21b57e81a28550a1b31bc8a39406d17b (diff)
downloademacs-ea0b913ab64c872b169a4b9dfd3e4699cb1fd637.tar.gz
emacs-ea0b913ab64c872b169a4b9dfd3e4699cb1fd637.zip
Delete variable window-system-version obsolete since 24.3
* lisp/frame.el (window-system-version): Delete variable. * src/dispnew.c (syms_of_display) <Vwindow_system_version>: Delete DEFVAR, obsolete since 24.3. (init_display_interactive, syms_of_display_for_pdumper): * src/msdos.c (internal_terminal_init): * src/nsterm.m (ns_term_init): * src/pgtkfns.c (pgtk_display_info_for_name): * src/w32fns.c (w32_display_info_for_name, Fx_open_connection): * src/xfns.c (x_display_info_for_name, Fx_open_connection): Don't set above deleted variable. * admin/admin.el (set-version): Don't update above deleted variable in msdos.c. * lisp/textmodes/artist.el (artist-submit-bug-report): Don't use above deleted variable.
Diffstat (limited to 'src')
-rw-r--r--src/dispnew.c12
-rw-r--r--src/msdos.c1
-rw-r--r--src/nsterm.m11
-rw-r--r--src/pgtkfns.c2
-rw-r--r--src/w32fns.c3
-rw-r--r--src/xfns.c3
6 files changed, 0 insertions, 32 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 53a47c4b2f2..8932f103f1f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6504,9 +6504,6 @@ init_display_interactive (void)
6504 if (!inhibit_window_system && display_arg) 6504 if (!inhibit_window_system && display_arg)
6505 { 6505 {
6506 Vinitial_window_system = Qx; 6506 Vinitial_window_system = Qx;
6507#ifdef HAVE_X11
6508 Vwindow_system_version = make_fixnum (11);
6509#endif
6510#ifdef USE_NCURSES 6507#ifdef USE_NCURSES
6511 /* In some versions of ncurses, 6508 /* In some versions of ncurses,
6512 tputs crashes if we have not called tgetent. 6509 tputs crashes if we have not called tgetent.
@@ -6521,7 +6518,6 @@ init_display_interactive (void)
6521 if (!inhibit_window_system) 6518 if (!inhibit_window_system)
6522 { 6519 {
6523 Vinitial_window_system = Qw32; 6520 Vinitial_window_system = Qw32;
6524 Vwindow_system_version = make_fixnum (1);
6525 return; 6521 return;
6526 } 6522 }
6527#endif /* HAVE_NTGUI */ 6523#endif /* HAVE_NTGUI */
@@ -6530,7 +6526,6 @@ init_display_interactive (void)
6530 if (!inhibit_window_system && !will_dump_p ()) 6526 if (!inhibit_window_system && !will_dump_p ())
6531 { 6527 {
6532 Vinitial_window_system = Qns; 6528 Vinitial_window_system = Qns;
6533 Vwindow_system_version = make_fixnum (10);
6534 return; 6529 return;
6535 } 6530 }
6536#endif 6531#endif
@@ -6539,7 +6534,6 @@ init_display_interactive (void)
6539 if (!inhibit_window_system && !will_dump_p ()) 6534 if (!inhibit_window_system && !will_dump_p ())
6540 { 6535 {
6541 Vinitial_window_system = Qpgtk; 6536 Vinitial_window_system = Qpgtk;
6542 Vwindow_system_version = make_fixnum (3);
6543 return; 6537 return;
6544 } 6538 }
6545#endif 6539#endif
@@ -6548,7 +6542,6 @@ init_display_interactive (void)
6548 if (!inhibit_window_system && !will_dump_p ()) 6542 if (!inhibit_window_system && !will_dump_p ())
6549 { 6543 {
6550 Vinitial_window_system = Qhaiku; 6544 Vinitial_window_system = Qhaiku;
6551 Vwindow_system_version = make_fixnum (1);
6552 return; 6545 return;
6553 } 6546 }
6554#endif 6547#endif
@@ -6766,10 +6759,6 @@ Use of this variable as a boolean is deprecated. Instead,
6766use `display-graphic-p' or any of the other `display-*-p' 6759use `display-graphic-p' or any of the other `display-*-p'
6767predicates which report frame's specific UI-related capabilities. */); 6760predicates which report frame's specific UI-related capabilities. */);
6768 6761
6769 DEFVAR_LISP ("window-system-version", Vwindow_system_version,
6770 doc: /* The version number of the window system in use.
6771For X windows, this is 11. */);
6772
6773 DEFVAR_BOOL ("cursor-in-echo-area", cursor_in_echo_area, 6762 DEFVAR_BOOL ("cursor-in-echo-area", cursor_in_echo_area,
6774 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */); 6763 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */);
6775 6764
@@ -6817,5 +6806,4 @@ static void
6817syms_of_display_for_pdumper (void) 6806syms_of_display_for_pdumper (void)
6818{ 6807{
6819 Vinitial_window_system = Qnil; 6808 Vinitial_window_system = Qnil;
6820 Vwindow_system_version = Qnil;
6821} 6809}
diff --git a/src/msdos.c b/src/msdos.c
index 1608245904c..1d3fdd528d7 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1794,7 +1794,6 @@ internal_terminal_init (void)
1794 } 1794 }
1795 1795
1796 Vinitial_window_system = Qpc; 1796 Vinitial_window_system = Qpc;
1797 Vwindow_system_version = make_fixnum (29); /* RE Emacs version */
1798 tty->terminal->type = output_msdos_raw; 1797 tty->terminal->type = output_msdos_raw;
1799 1798
1800 /* If Emacs was dumped on DOS/V machine, forget the stale VRAM 1799 /* If Emacs was dumped on DOS/V machine, forget the stale VRAM
diff --git a/src/nsterm.m b/src/nsterm.m
index d6290449b43..b8b4e66cd11 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5607,17 +5607,6 @@ ns_term_init (Lisp_Object display_name)
5607 5607
5608 NSTRACE_MSG ("Versions"); 5608 NSTRACE_MSG ("Versions");
5609 5609
5610 {
5611#ifdef NS_IMPL_GNUSTEP
5612 Vwindow_system_version = build_string (gnustep_base_version);
5613#else
5614 /* PSnextrelease (128, c); */
5615 char c[DBL_BUFSIZE_BOUND];
5616 int len = dtoastr (c, sizeof c, 0, 0, NSAppKitVersionNumber);
5617 Vwindow_system_version = make_unibyte_string (c, len);
5618#endif
5619 }
5620
5621 delete_keyboard_wait_descriptor (0); 5610 delete_keyboard_wait_descriptor (0);
5622 5611
5623 ns_app_name = [[NSProcessInfo processInfo] processName]; 5612 ns_app_name = [[NSProcessInfo processInfo] processName];
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index beaf28f69d9..9473e14f5cf 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -164,8 +164,6 @@ pgtk_display_info_for_name (Lisp_Object name)
164 if (dpyinfo == 0) 164 if (dpyinfo == 0)
165 error ("Cannot connect to display server %s", SDATA (name)); 165 error ("Cannot connect to display server %s", SDATA (name));
166 166
167 XSETFASTINT (Vwindow_system_version, 11);
168
169 return dpyinfo; 167 return dpyinfo;
170} 168}
171 169
diff --git a/src/w32fns.c b/src/w32fns.c
index 28d13a68d45..745458d0a03 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6699,8 +6699,6 @@ w32_display_info_for_name (Lisp_Object name)
6699 if (dpyinfo == 0) 6699 if (dpyinfo == 0)
6700 error ("Cannot connect to server %s", SDATA (name)); 6700 error ("Cannot connect to server %s", SDATA (name));
6701 6701
6702 XSETFASTINT (Vwindow_system_version, w32_major_version);
6703
6704 return dpyinfo; 6702 return dpyinfo;
6705} 6703}
6706 6704
@@ -6781,7 +6779,6 @@ DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection,
6781 error ("Cannot connect to server %s", SDATA (display)); 6779 error ("Cannot connect to server %s", SDATA (display));
6782 } 6780 }
6783 6781
6784 XSETFASTINT (Vwindow_system_version, w32_major_version);
6785 return Qnil; 6782 return Qnil;
6786} 6783}
6787 6784
diff --git a/src/xfns.c b/src/xfns.c
index fc8b30a9d6f..ecb869bf360 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -7250,8 +7250,6 @@ x_display_info_for_name (Lisp_Object name)
7250 if (dpyinfo == 0) 7250 if (dpyinfo == 0)
7251 error ("Cannot connect to X server %s", SDATA (name)); 7251 error ("Cannot connect to X server %s", SDATA (name));
7252 7252
7253 XSETFASTINT (Vwindow_system_version, 11);
7254
7255 return dpyinfo; 7253 return dpyinfo;
7256} 7254}
7257 7255
@@ -7295,7 +7293,6 @@ An insecure way to solve the problem may be to use `xhost'.\n",
7295 error ("Cannot connect to X server %s", SDATA (display)); 7293 error ("Cannot connect to X server %s", SDATA (display));
7296 } 7294 }
7297 7295
7298 XSETFASTINT (Vwindow_system_version, 11);
7299 return Qnil; 7296 return Qnil;
7300} 7297}
7301 7298