From: Juanma Barranquero <lekktu@gmail.com>
Date: Sat, 22 Mar 2014 00:24:00 +0000 (+0100)
Subject: lisp/w32-common-fns.el (x-selection-owner-p): Get documentation from DOC.
X-Git-Tag: emacs-24.3.90~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aac06179d84186ac37374c437917813bfb29c4d0;p=emacs.git

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 4839c191ba6..516261666df 100644
--- 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 72946f9bb96..d149500c327 100644
--- 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