diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-29 00:04:09 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-29 00:04:09 -0700 |
| commit | 4f4f2973e5229b984da408bb74e2a9a78f6d4051 (patch) | |
| tree | 78f6eb3eaa9c4336a1f0108d8909f503e53aa9ec /src/w32fns.c | |
| parent | e088c02a81d502ef52cb494d6b73238b94861e3a (diff) | |
| download | emacs-4f4f2973e5229b984da408bb74e2a9a78f6d4051.tar.gz | |
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.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 1612182c660..15dbb404737 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4511,7 +4511,8 @@ DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0, DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0, - doc: /* Internal function called by `color-defined-p', which see. */) + doc: /* Internal function called by `color-defined-p', which see. +\(Note that the Nextstep version of this function ignores FRAME.) */) (Lisp_Object color, Lisp_Object frame) { XColor foo; @@ -4851,11 +4852,12 @@ x_display_info_for_name (Lisp_Object name) } DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection, - 1, 3, 0, doc: /* Open a connection to a server. + 1, 3, 0, doc: /* Open a connection to a display server. DISPLAY is the name of the display to connect to. Optional second arg XRM-STRING is a string of resources in xrdb format. If the optional third arg MUST-SUCCEED is non-nil, -terminate Emacs if we can't open the connection. */) +terminate Emacs if we can't open the connection. +\(In the Nextstep version, the last two arguments are currently ignored.) */) (Lisp_Object display, Lisp_Object xrm_string, Lisp_Object must_succeed) { unsigned char *xrm_option; @@ -7267,5 +7269,3 @@ w32_last_error (void) return GetLastError (); } -/* arch-tag: 707589ab-b9be-4638-8cdd-74629cc9b446 - (do not change this comment) */ |