[Emacs-diffs] /srv/bzr/emacs/trunk r103917: Fix link errors in the Mac OS build that were caused by variables being marked as static that should not have been.

[Ben Key]

------------------------------------------------------------
revno: 103917
committer: Ben Key <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-14 21:03:43 -0500
message:
  Fix link errors in the Mac OS build that were caused by variables being 
marked as static that should not have been.
modified:
  src/ChangeLog
  src/keyboard.c
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-15 01:26:32 +0000
+++ b/src/ChangeLog     2011-04-15 02:03:43 +0000
@@ -1,3 +1,10 @@
+2011-04-15  Ben Key  <address@hidden>
+
+       * keyboard.c (Qundefined):  Don't declare static since it is
+       used in nsfns.m.
+       * xfaces.c (Qbold, Qexpanded, Qitalic, Qcondensed):  Don't
+       declare static since they are used in nsfont.m.
+
 2011-04-15  Stefan Monnier  <address@hidden>
 
        * process.c (Qprocessp): Don't declare static.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-04-14 20:16:48 +0000
+++ b/src/keyboard.c    2011-04-15 02:03:43 +0000
@@ -246,7 +246,7 @@
 static Lisp_Object Qself_insert_command;
 static Lisp_Object Qforward_char;
 static Lisp_Object Qbackward_char;
-static Lisp_Object Qundefined;
+Lisp_Object Qundefined;
 static Lisp_Object Qtimer_event_handler;
 
 /* read_key_sequence stores here the command definition of the

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2011-04-14 05:04:02 +0000
+++ b/src/xfaces.c      2011-04-15 02:03:43 +0000
@@ -317,11 +317,15 @@
 /* Symbols used for attribute values.  */
 
 Lisp_Object Qnormal;
-static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight;
+Lisp_Object Qbold;
+static Lisp_Object Qultra_light, Qextra_light, Qlight;
 static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
-static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic;
-static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
-static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
+static Lisp_Object Qoblique, Qreverse_oblique, Qreverse_italic;
+Lisp_Object Qitalic;
+static Lisp_Object Qultra_condensed, Qextra_condensed;
+Lisp_Object Qcondensed;
+static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qextra_expanded;
+Lisp_Object Qexpanded;
 static Lisp_Object Qultra_expanded;
 static Lisp_Object Qreleased_button, Qpressed_button;
 static Lisp_Object QCstyle, QCcolor, QCline_width;