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.

diff --git a/src/ChangeLog b/src/ChangeLog
index c46d23dd82e765352c22259c1f1b9693d5d86186..95880e806ee72abb187822c6519f52a8a20380ce 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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  <rudalics@gmx.at>
 
        * dispnew.c (change_frame_size_1): Fix call of

diff --git a/src/frame.c b/src/frame.c
index 5bb2c831c20a935d251dfdc3f7d4f06b9b307bae..b03e207c105ae70a40d8ca126068f3dd7a4f1c55 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -77,7 +77,7 @@ Lisp_Object Qterminal;
 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;

diff --git a/src/lisp.h b/src/lisp.h
index d8809fd10d7fb64ce00ceb063c6cf6b76cb8d967..bdff0195eac6ef3d50a45f5911896cfac56d48b2 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3863,7 +3863,7 @@ extern ptrdiff_t evxprintf (char **, ptrdiff_t *, char const *, ptrdiff_t,
   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);

diff --git a/src/lread.c b/src/lread.c
index 171a51acb3f40abee55b34ebfeebc4338a555f8f..6f71ff5f468c2786a83bd0f5ef7ff53d2af3e177 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -66,7 +66,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* 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;

diff --git a/src/w32notify.c b/src/w32notify.c
index 86412b8a97439afad8447c912248e3494884f820..4f8c79a1f3af2513f02b09a512eed9e1315fe9fe 100644 (file)
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -118,7 +118,7 @@ BYTE file_notifications[16384];
 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 @@ syms_of_w32notify (void)
   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");