aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-03-06 14:48:46 -0500
committerGlenn Morris2012-03-06 14:48:46 -0500
commit69481eb82d6b79eebb3c7283060fe8156089c381 (patch)
treef34381c80a63cb377aa245faa347bb55cd1c6467
parent133b8e1120761af85822cfcf3dd8fe440ec058cf (diff)
downloademacs-69481eb82d6b79eebb3c7283060fe8156089c381.tar.gz
emacs-69481eb82d6b79eebb3c7283060fe8156089c381.zip
pc-win.el doc fix for bug#10783
* lisp/term/pc-win.el (x-selection-owner-p, x-own-selection-internal) (x-disown-selection-internal, x-get-selection-internal): Doc fix (add arglist signatures).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/term/pc-win.el22
2 files changed, 24 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d7d250712f..aef9e548055 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-03-06 Glenn Morris <rgm@gnu.org>
2
3 * term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
4 (x-disown-selection-internal, x-get-selection-internal):
5 Doc fix (add arglist signatures). (Bug#10783)
6
12012-03-06 Kaushik Srenevasan <ksrenevasan@gmail.com> (tiny change) 72012-03-06 Kaushik Srenevasan <ksrenevasan@gmail.com> (tiny change)
2 8
3 * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom): 9 * progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom):
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index fc86d4179b6..b460e3b8a14 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -159,6 +159,12 @@ created."
159;; returned value matters. Also, by the way, recall that `ignore' is 159;; returned value matters. Also, by the way, recall that `ignore' is
160;; a useful function for returning 'nil regardless of argument. 160;; a useful function for returning 'nil regardless of argument.
161 161
162;; Note: Any re-definition in this file of a function that is defined
163;; in C on other platforms, should either have no doc-string, or one
164;; that is identical to the C version, but with the arglist signature
165;; at the end. Otherwise help-split-fundoc gets confused on other
166;; platforms. (Bug#10783)
167
162;; From src/xfns.c 168;; From src/xfns.c
163(defun x-list-fonts (pattern &optional face frame maximum width) 169(defun x-list-fonts (pattern &optional face frame maximum width)
164 (if (or (null width) (and (numberp width) (= width 1))) 170 (if (or (null width) (and (numberp width) (= width 1)))
@@ -261,7 +267,9 @@ TERMINAL should be a terminal object or a frame specifying the X
261server to query. If omitted or nil, that stands for the selected 267server to query. If omitted or nil, that stands for the selected
262frame's display, or the first available X display. 268frame's display, or the first available X display.
263 269
264On Nextstep, TERMINAL is unused." 270On Nextstep, TERMINAL is unused.
271
272\(fn &optional SELECTION TERMINAL)"
265 (if x-select-enable-clipboard 273 (if x-select-enable-clipboard
266 (let (text) 274 (let (text)
267 ;; Don't die if w16-get-clipboard-data signals an error. 275 ;; Don't die if w16-get-clipboard-data signals an error.
@@ -289,7 +297,9 @@ anything that the functions on `selection-converter-alist' know about.
289FRAME should be a frame that should own the selection. If omitted or 297FRAME should be a frame that should own the selection. If omitted or
290nil, it defaults to the selected frame. 298nil, it defaults to the selected frame.
291 299
292On Nextstep, FRAME is unused." 300On Nextstep, FRAME is unused.
301
302\(fn SELECTION VALUE &optional FRAME)"
293 (ignore-errors 303 (ignore-errors
294 (x-select-text value)) 304 (x-select-text value))
295 value) 305 value)
@@ -306,7 +316,9 @@ server to query. If omitted or nil, that stands for the selected
306frame's display, or the first available X display. 316frame's display, or the first available X display.
307 317
308On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused. 318On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused.
309On MS-DOS, all this does is return non-nil if we own the selection." 319On MS-DOS, all this does is return non-nil if we own the selection.
320
321\(fn SELECTION &optional TIME-OBJECT TERMINAL)"
310 (if (x-selection-owner-p selection) 322 (if (x-selection-owner-p selection)
311 t)) 323 t))
312 324
@@ -324,7 +336,9 @@ TERMINAL should be a terminal object or a frame specifying the X
324server to query. If omitted or nil, that stands for the selected 336server to query. If omitted or nil, that stands for the selected
325frame's display, or the first available X display. 337frame's display, or the first available X display.
326 338
327On Nextstep, TIME-STAMP and TERMINAL are unused." 339On Nextstep, TIME-STAMP and TERMINAL are unused.
340
341\(fn SELECTION-SYMBOL TARGET-TYPE &optional TIME-STAMP TERMINAL)"
328 (x-get-selection-value)) 342 (x-get-selection-value))
329 343
330;; From src/fontset.c: 344;; From src/fontset.c: