[Emacs-diffs] trunk r118311: Uniquify the 'size' symbol.

[Paul Eggert]

------------------------------------------------------------
revno: 118311
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-11-07 07:40:06 -0800
message:
  Uniquify the 'size' symbol.
  
  * frame.c (Qsize):
  * w32notify.c (Qsize): Remove.
  * lisp.h (Qsize): New decl.
  * lread.c (Qsize): Now extern.
  * w32notify.c (syms_of_w32notify): No need to defsym.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/lread.c                    lread.c-20091113204419-o5vbwnq5f7feedwu-266
  src/w32notify.c                w32notify.c-20121007123611-xyh65j2ka2vm684f-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-07 10:49:22 +0000
+++ b/src/ChangeLog     2014-11-07 15:40:06 +0000
@@ -1,3 +1,12 @@
+2014-11-07  Paul Eggert  <address@hidden>
+
+       Uniquify the 'size' symbol.
+       * frame.c (Qsize):
+       * w32notify.c (Qsize): Remove.
+       * lisp.h (Qsize): New decl.
+       * lread.c (Qsize): Now extern.
+       * w32notify.c (syms_of_w32notify): No need to defsym.
+
 2014-11-07  Martin Rudalics  <address@hidden>
 
        * dispnew.c (change_frame_size_1): Fix call of

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-11-07 10:49:22 +0000
+++ b/src/frame.c       2014-11-07 15:40:06 +0000
@@ -77,7 +77,7 @@
 Lisp_Object Qauto_raise, Qauto_lower;
 Lisp_Object Qborder_color, Qborder_width;
 Lisp_Object Qcursor_color, Qcursor_type;
-Lisp_Object Qheight, Qwidth, Qsize;
+Lisp_Object Qheight, Qwidth;
 Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name;
 Lisp_Object Qtooltip;
 Lisp_Object Qinternal_border_width;

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2014-10-15 13:37:10 +0000
+++ b/src/lisp.h        2014-11-07 15:40:06 +0000
@@ -3863,7 +3863,7 @@
   ATTRIBUTE_FORMAT_PRINTF (5, 0);
 
 /* Defined in lread.c.  */
-extern Lisp_Object Qvariable_documentation, Qstandard_input;
+extern Lisp_Object Qsize, Qvariable_documentation, Qstandard_input;
 extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
 extern Lisp_Object Qlexical_binding;
 extern Lisp_Object check_obarray (Lisp_Object);

=== modified file 'src/lread.c'
--- a/src/lread.c       2014-10-12 20:09:15 +0000
+++ b/src/lread.c       2014-11-07 15:40:06 +0000
@@ -66,7 +66,8 @@
 
 /* Hash table read constants.  */
 static Lisp_Object Qhash_table, Qdata;
-static Lisp_Object Qtest, Qsize;
+static Lisp_Object Qtest;
+Lisp_Object Qsize;
 static Lisp_Object Qweakness;
 static Lisp_Object Qrehash_size;
 static Lisp_Object Qrehash_threshold;

=== modified file 'src/w32notify.c'
--- a/src/w32notify.c   2014-03-26 10:21:55 +0000
+++ b/src/w32notify.c   2014-11-07 15:40:06 +0000
@@ -118,7 +118,7 @@
 DWORD notifications_size;
 void *notifications_desc;
 
-static Lisp_Object Qfile_name, Qdirectory_name, Qattributes, Qsize;
+static Lisp_Object Qfile_name, Qdirectory_name, Qattributes;
 static Lisp_Object Qlast_write_time, Qlast_access_time, Qcreation_time;
 static Lisp_Object Qsecurity_desc, Qsubtree, watch_list;
 
@@ -642,7 +642,6 @@
   DEFSYM (Qfile_name, "file-name");
   DEFSYM (Qdirectory_name, "directory-name");
   DEFSYM (Qattributes, "attributes");
-  DEFSYM (Qsize, "size");
   DEFSYM (Qlast_write_time, "last-write-time");
   DEFSYM (Qlast_access_time, "last-access-time");
   DEFSYM (Qcreation_time, "creation-time");