emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114327: * dispextern.h (check_x_display_info, x_get


From: Dmitry Antipov
Subject: [Emacs-diffs] trunk r114327: * dispextern.h (check_x_display_info, x_get_string_resource):
Date: Tue, 17 Sep 2013 12:28:33 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114327
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 16:27:21 +0400
message:
  * dispextern.h (check_x_display_info, x_get_string_resource):
  Declare here just once and unify the latter.
  * frame.c (check_x_display_info, x_get_string_resource):
  * nsterm.h (check_x_display_info):
  * xrdb.c (x_get_string_resource):
  * xterm.h (check_x_display_info): Remove prototypes.
  * nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
  * w32reg.c (x_get_string_resource): Likewise.
  (w32_get_rdb_resource): Adjust user.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/w32reg.c                   w32reg.c-20091113204419-o5vbwnq5f7feedwu-948
  src/xrdb.c                     xrdb.c-20091113204419-o5vbwnq5f7feedwu-177
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-17 08:24:20 +0000
+++ b/src/ChangeLog     2013-09-17 12:27:21 +0000
@@ -1,5 +1,17 @@
 2013-09-17  Dmitry Antipov  <address@hidden>
 
+       * dispextern.h (check_x_display_info, x_get_string_resource):
+       Declare here just once and unify the latter.
+       * frame.c (check_x_display_info, x_get_string_resource):
+       * nsterm.h (check_x_display_info):
+       * xrdb.c (x_get_string_resource):
+       * xterm.h (check_x_display_info): Remove prototypes.
+       * nsfns.m (x_get_string_resource): Likewise.  Adjust definition.
+       * w32reg.c (x_get_string_resource): Likewise.
+       (w32_get_rdb_resource): Adjust user.
+
+2013-09-17  Dmitry Antipov  <address@hidden>
+
        * xterm.h (struct x_display_info): New member
        x_pending_autoraise_frame, going to replace...
        * xterm.c (pending_autoraise_frame): ...static variable.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2013-09-09 12:15:45 +0000
+++ b/src/dispextern.h  2013-09-17 12:27:21 +0000
@@ -61,6 +61,7 @@
 }
 
 #ifdef HAVE_X_WINDOWS
+#include <X11/Xresource.h> /* for XrmDatabase */
 typedef struct x_display_info Display_Info;
 typedef XImage * XImagePtr;
 typedef XImagePtr XImagePtr_or_DC;
@@ -3530,6 +3531,7 @@
   RES_TYPE_BOOLEAN_NUMBER
 };
 
+extern Display_Info *check_x_display_info (Lisp_Object);
 extern Lisp_Object x_get_arg (Display_Info *, Lisp_Object,
                               Lisp_Object, const char *, const char *class,
                               enum resource_types);
@@ -3541,6 +3543,8 @@
                                         Lisp_Object, Lisp_Object,
                                         const char *, const char *,
                                         enum resource_types);
+extern char *x_get_string_resource (XrmDatabase, const char *,
+                                   const char *);
 
 #endif /* HAVE_WINDOW_SYSTEM */
 

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-15 08:28:30 +0000
+++ b/src/frame.c       2013-09-17 12:27:21 +0000
@@ -3520,11 +3520,6 @@
     }
 }
 
-
-extern char *x_get_string_resource (XrmDatabase, const char *, const char *);
-extern Display_Info *check_x_display_info (Lisp_Object);
-
-
 /* Get specified attribute from resource database RDB.
    See Fx_get_resource below for other parameters.  */
 

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-09-15 19:43:32 +0000
+++ b/src/nsfns.m       2013-09-17 12:27:21 +0000
@@ -2211,17 +2211,13 @@
                                       wid - 1) / wid;
 }
 
-
-extern const char *x_get_string_resource (XrmDatabase, char *, char *);
-
-
 /* terms impl this instead of x-get-resource directly */
-const char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+char *
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
 {
   /* remove appname prefix; TODO: allow for !="Emacs" */
-  char *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
-  const char *res;
+  const char *res, *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
+
   check_window_system (NULL);
 
   if (inhibit_x_resources)
@@ -2229,9 +2225,9 @@
     return NULL;
 
   res = ns_get_defaults_value (toCheck);
-  return !res ? NULL :
-      (!c_strncasecmp (res, "YES", 3) ? "true" :
-          (!c_strncasecmp (res, "NO", 2) ? "false" : res));
+  return (!res ? NULL :
+         (!c_strncasecmp (res, "YES", 3) ? "true" :
+          (!c_strncasecmp (res, "NO", 2) ? "false" : (char *) res)));
 }
 
 

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2013-09-15 17:58:46 +0000
+++ b/src/nsterm.h      2013-09-17 12:27:21 +0000
@@ -605,8 +605,6 @@
 extern Lisp_Object ns_display_name_list;
 extern struct ns_display_info *ns_display_info_for_name (Lisp_Object name);
 
-struct ns_display_info *check_x_display_info (Lisp_Object frame);
-
 struct ns_output
 {
 #ifdef __OBJC__

=== modified file 'src/w32reg.c'
--- a/src/w32reg.c      2013-01-01 09:11:05 +0000
+++ b/src/w32reg.c      2013-09-17 12:27:21 +0000
@@ -56,7 +56,7 @@
 */
 
 static char *
-w32_get_rdb_resource (char *rdb, char *resource)
+w32_get_rdb_resource (char *rdb, const char *resource)
 {
   char *value = rdb;
   int len = strlen (resource);
@@ -141,7 +141,7 @@
    database RDB. */
 
 char *
-x_get_string_resource (XrmDatabase rdb, char *name, char *class)
+x_get_string_resource (XrmDatabase rdb, const char *name, const char *class)
 {
   if (rdb)
     {

=== modified file 'src/xrdb.c'
--- a/src/xrdb.c        2013-08-11 01:30:20 +0000
+++ b/src/xrdb.c        2013-09-17 12:27:21 +0000
@@ -48,10 +48,6 @@
 #include "keyboard.h"
 #endif
 
-char *x_get_string_resource (XrmDatabase rdb, const char *name,
-                            const char *class);
-
-
 /* X file search path processing.  */
 
 

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-09-17 08:24:20 +0000
+++ b/src/xterm.h       2013-09-17 12:27:21 +0000
@@ -975,7 +975,6 @@
 
 /* Defined in xfns.c */
 
-extern struct x_display_info * check_x_display_info (Lisp_Object);
 extern Lisp_Object x_get_focus_frame (struct frame *);
 
 #ifdef USE_GTK


reply via email to

[Prev in Thread] Current Thread [Next in Thread]