comparison src/xfns.c @ 111224:b9e560ce3ab6

Sync docs of some X, W32, NS C functions. * src/nsfns.m (Fx-display-save-under, Fx-open-connection) (Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip): * src/w32fns.c (Fxw_color_defined_p, Fx_open_connection): * src/xfns.c (Fxw_color_defined_p, Fx_open_connection): Sync docs between X, W32, NS.
author Glenn Morris <rgm@gnu.org>
date Fri, 29 Oct 2010 00:04:09 -0700
parents 93d41f7676cf
children 6316c70b291e
comparison
equal deleted inserted replaced
111223:0cd3fc7f7dba 111224:b9e560ce3ab6
3579 return Qnil; 3579 return Qnil;
3580 } 3580 }
3581 3581
3582 3582
3583 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, 3583 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
3584 doc: /* Internal function called by `color-defined-p', which see. */) 3584 doc: /* Internal function called by `color-defined-p', which see
3585 .\(Note that the Nextstep version of this function ignores FRAME.) */)
3585 (Lisp_Object color, Lisp_Object frame) 3586 (Lisp_Object color, Lisp_Object frame)
3586 { 3587 {
3587 XColor foo; 3588 XColor foo;
3588 FRAME_PTR f = check_x_frame (frame); 3589 FRAME_PTR f = check_x_frame (frame);
3589 3590
4097 } 4098 }
4098 4099
4099 4100
4100 DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection, 4101 DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection,
4101 1, 3, 0, 4102 1, 3, 0,
4102 doc: /* Open a connection to an X server. 4103 doc: /* Open a connection to a display server.
4103 DISPLAY is the name of the display to connect to. 4104 DISPLAY is the name of the display to connect to.
4104 Optional second arg XRM-STRING is a string of resources in xrdb format. 4105 Optional second arg XRM-STRING is a string of resources in xrdb format.
4105 If the optional third arg MUST-SUCCEED is non-nil, 4106 If the optional third arg MUST-SUCCEED is non-nil,
4106 terminate Emacs if we can't open the connection. */) 4107 terminate Emacs if we can't open the connection.
4108 \(In the Nextstep version, the last two arguments are currently ignored.) */)
4107 (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) 4109 (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed)
4108 { 4110 {
4109 unsigned char *xrm_option; 4111 unsigned char *xrm_option;
4110 struct x_display_info *dpyinfo; 4112 struct x_display_info *dpyinfo;
4111 4113