[Emacs-diffs] /srv/bzr/emacs/trunk r112124: * xfaces.c (Finternal_face_x_get_resource): Allow 3rd (frame) argument

[Dmitry Antipov]

------------------------------------------------------------
revno: 112124
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-24 09:29:35 +0400
message:
  * xfaces.c (Finternal_face_x_get_resource): Allow 3rd (frame) argument
  to be optional or nil.  Adjust comment and convert it to docstring.
  * xselect.c (Fx_send_client_event): Rename to Fx_send_client_message.
  * frame.c (display_x_get_resource, Fx_get_resource): Break long line.
modified:
  src/ChangeLog
  src/frame.c
  src/xfaces.c
  src/xselect.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-24 02:40:51 +0000
+++ b/src/ChangeLog     2013-03-24 05:29:35 +0000
@@ -1,3 +1,10 @@
+2013-03-24  Dmitry Antipov  <address@hidden>
+
+       * xfaces.c (Finternal_face_x_get_resource): Allow 3rd (frame) argument
+       to be optional or nil.  Adjust comment and convert it to docstring.
+       * xselect.c (Fx_send_client_event): Rename to Fx_send_client_message.
+       * frame.c (display_x_get_resource, Fx_get_resource): Break long line.
+
 2013-03-24  Paul Eggert  <address@hidden>
 
        Static checking by GCC 4.8-20130319.

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-03-23 09:01:14 +0000
+++ b/src/frame.c       2013-03-24 05:29:35 +0000
@@ -3495,7 +3495,8 @@
 class, respectively.  You must specify both of them or neither.
 If you specify them, the key is `INSTANCE.COMPONENT.ATTRIBUTE'
 and the class is `Emacs.CLASS.SUBCLASS'.  */)
-  (Lisp_Object attribute, Lisp_Object class, Lisp_Object component, 
Lisp_Object subclass)
+  (Lisp_Object attribute, Lisp_Object class, Lisp_Object component,
+   Lisp_Object subclass)
 {
 #ifdef HAVE_X_WINDOWS
   check_x ();
@@ -3508,7 +3509,9 @@
 /* Get an X resource, like Fx_get_resource, but for display DPYINFO.  */
 
 Lisp_Object
-display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute, 
Lisp_Object class, Lisp_Object component, Lisp_Object subclass)
+display_x_get_resource (Display_Info *dpyinfo, Lisp_Object attribute,
+                       Lisp_Object class, Lisp_Object component,
+                       Lisp_Object subclass)
 {
   return xrdb_get_resource (dpyinfo->xrdb,
                            attribute, class, component, subclass);

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-03-20 09:56:19 +0000
+++ b/src/xfaces.c      2013-03-24 05:29:35 +0000
@@ -3395,21 +3395,22 @@
     }
 }
 
-
-/* Get the value of X resource RESOURCE, class CLASS for the display
-   of frame FRAME.  This is here because ordinary `x-get-resource'
-   doesn't take a frame argument.  */
-
 DEFUN ("internal-face-x-get-resource", Finternal_face_x_get_resource,
-       Sinternal_face_x_get_resource, 3, 3, 0, doc: /* */)
+       Sinternal_face_x_get_resource, 2, 3, 0,
+       doc: /* Get the value of X resource RESOURCE, class CLASS.
+Returned value is for the display of frame FRAME.  If FRAME is not
+specified or nil, use selected frame.  This function exists because
+ordinary `x-get-resource' doesn't take a frame argument.  */)
   (Lisp_Object resource, Lisp_Object class, Lisp_Object frame)
 {
   Lisp_Object value = Qnil;
+  struct frame *f;
+
   CHECK_STRING (resource);
   CHECK_STRING (class);
-  CHECK_LIVE_FRAME (frame);
+  f = decode_live_frame (frame);
   block_input ();
-  value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
+  value = display_x_get_resource (FRAME_X_DISPLAY_INFO (f),
                                  resource, class, Qnil, Qnil);
   unblock_input ();
   return value;

=== modified file 'src/xselect.c'
--- a/src/xselect.c     2013-03-05 01:48:30 +0000
+++ b/src/xselect.c     2013-03-24 05:29:35 +0000
@@ -2571,7 +2571,7 @@
   return 1;
 }
 
-DEFUN ("x-send-client-message", Fx_send_client_event,
+DEFUN ("x-send-client-message", Fx_send_client_message,
        Sx_send_client_message, 6, 6, 0,
        doc: /* Send a client message of MESSAGE-TYPE to window DEST on DISPLAY.