[Emacs-diffs] emacs-24 r116826: lisp/w32-common-fns.el (x-selection-owner-p): Get documentation from DOC.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116826
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-03-22 01:24:00 +0100
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/w32-common-fns.el         
w32commonfns.el-20120917115700-3at3xhn4to67xnca-4

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-21 13:02:25 +0000
+++ b/lisp/ChangeLog    2014-03-22 00:24:00 +0000
@@ -1,3 +1,8 @@
+2014-03-22  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'

=== modified file 'lisp/w32-common-fns.el'
--- a/lisp/w32-common-fns.el    2014-02-10 17:05:52 +0000
+++ b/lisp/w32-common-fns.el    2014-03-22 00:24:00 +0000
@@ -84,9 +84,10 @@
   (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