lisp/w32-common-fns.el (x-selection-owner-p): Get documentation from DOC.

Add empty docstring for the benefit of doc.c; change parameter profile
to match the X function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4839c191ba6117024c03d2212bf1fffd66c0b21f..516261666df3bfa20a17f923a9a4d902729ff668 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
+       benefit of doc.c; change parameter profile to match the X function.
+
 2014-03-21  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'

diff --git a/lisp/w32-common-fns.el b/lisp/w32-common-fns.el
index 72946f9bb96d8ff49691814f55c721327c46ccbd..d149500c3273e7e6b759d787a5dcd22683761fb6 100644 (file)
--- a/lisp/w32-common-fns.el
+++ b/lisp/w32-common-fns.el
@@ -84,9 +84,10 @@ ignored on MS-Windows and MS-DOS."
   (get 'x-selections (or type 'PRIMARY)))
 
 ;; x-selection-owner-p is used in simple.el
-(defun x-selection-owner-p (&optional type)
-  (and (memq type '(nil PRIMARY SECONDARY))
-       (get 'x-selections (or type 'PRIMARY))))
+(defun x-selection-owner-p (&optional selection _terminal)
+  "" ; placeholder for doc.c
+  (and (memq selection '(nil PRIMARY SECONDARY))
+       (get 'x-selections (or selection 'PRIMARY))))
 
 ;; The "Windows" keys on newer keyboards bring up the Start menu
 ;; whether you want it or not - make Emacs ignore these keystrokes