From: Po Lu Date: Fri, 24 Dec 2021 07:24:35 +0000 (+0800) Subject: Remove useless functions from PGTK port that were breaking emacsbug X-Git-Tag: emacs-29.0.90~3478 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e0d327b8ce7cacf2de8ad38c4bd432a94750622;p=emacs.git Remove useless functions from PGTK port that were breaking emacsbug * src/pgtkfns.c (Fx_server_vendor, Fx_server_version): Remove useless functions that returned invalid values. (syms_of_pgtkfns): Stop defining removed subrs. --- diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 44e3d2a37e2..a756bd4284d 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -2083,42 +2083,6 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, Sx_server_max_re } -DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Return the "vendor ID" string of the display server TERMINAL. -\(Labeling every distributor as a "vendor" embodies the false assumption -that operating systems cannot be developed and distributed noncommercially.) -The optional argument TERMINAL specifies which display to ask about. -TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */) - (Lisp_Object terminal) -{ - check_pgtk_display_info (terminal); - return Qnil; -} - - -DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, - doc: /* Return the version numbers of the server of display TERMINAL. -The value is a list of three integers: the major and minor -version numbers of the X Protocol in use, and the distributor-specific release -number. See also the function `x-server-vendor'. - -The optional argument TERMINAL specifies which display to ask about. -TERMINAL should be a terminal object, a frame or a display name (a string). -If omitted or nil, that stands for the selected frame's display. */ ) - (Lisp_Object terminal) -{ - check_pgtk_display_info (terminal); - /*NOTE: it is unclear what would best correspond with "protocol"; - we return 10.3, meaning Panther, since this is roughly the - level that GNUstep's APIs correspond to. - The last number is where we distinguish between the Apple - and GNUstep implementations ("distributor-specific release - number") and give int'ized versions of major.minor. */ - return list3i (0, 0, 0); -} - - DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, doc: /* Return the number of screens on the display server TERMINAL. The optional argument TERMINAL specifies which display to ask about. @@ -4015,8 +3979,6 @@ be used as the image of the icon representing the frame. */); defsubr (&Sxw_color_defined_p); defsubr (&Sxw_color_values); defsubr (&Sx_server_max_request_size); - defsubr (&Sx_server_vendor); - defsubr (&Sx_server_version); defsubr (&Sx_display_pixel_width); defsubr (&Sx_display_pixel_height); defsubr (&Spgtk_display_monitor_attributes_list);