[Emacs-diffs] /srv/bzr/emacs/trunk r110845: * src/xfaces.c (Qultra_light, Qreverse_oblique, Qreverse_italic)

[Stefan Monnier]

------------------------------------------------------------
revno: 110845
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 16:02:10 -0500
message:
  * src/xfaces.c (Qultra_light, Qreverse_oblique, Qreverse_italic)
  (Qultra_condensed, Qextra_condensed, Qcondensed, Qsemi_condensed)
  (Qsemi_expanded, Qextra_expanded, Qexpanded, Qultra_expanded):
  Remove unused vars.
modified:
  src/ChangeLog
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-08 19:52:28 +0000
+++ b/src/ChangeLog     2012-11-08 21:02:10 +0000
@@ -1,3 +1,10 @@
+2012-11-08  Stefan Monnier  <address@hidden>
+
+       * xfaces.c (Qultra_light, Qreverse_oblique, Qreverse_italic)
+       (Qultra_condensed, Qextra_condensed, Qcondensed, Qsemi_condensed)
+       (Qsemi_expanded, Qextra_expanded, Qexpanded, Qultra_expanded):
+       Remove unused vars.
+
 2012-11-08  Jan Djärv  <address@hidden>
 
        * image.c (xpm_make_color_table_h): Fix compiler error because
@@ -225,8 +232,8 @@
 
        Remove EMACS_OUTQSIZE+sleep hack.
        * dispnew.c (update_frame_1): Remove hack for terminals slower
-       than 2400 bps, which throttled Emacs by having it sleep.  This
-       code hasn't worked since at least 2007, when the multi-tty stuff
+       than 2400 bps, which throttled Emacs by having it sleep.
+       This code hasn't worked since at least 2007, when the multi-tty stuff
        was added, and anyway those old terminals are long dead.
        * systty.h (EMACS_OUTQSIZE): Remove; unused.  The macro isn't used even
        without the dispnew.c change, as dispnew.c doesn't include systty.h.
@@ -265,8 +272,8 @@
        waitpid only on subprocesses that Emacs itself creates.
        * process.c (create_process, record_child_status_change):
        Don't use special value -1 in pid field, as the caller now must
-       know the pid rather than having the callee infer it.  The
-       inference was sometimes incorrect anyway, due to another race.
+       know the pid rather than having the callee infer it.
+       The inference was sometimes incorrect anyway, due to another race.
        (create_process): Set new 'alive' member if child is created.
        (process_status_retrieved): New function.
        (record_child_status_change): Use it.
@@ -427,8 +434,8 @@
 
 2012-10-29  Daniel Colascione  <address@hidden>
 
-       * cygw32.h, cygw32.c (Qutf_16le, from_unicode, to_unicode): In
-       preparation for fixing bug#12739, move these functions from
+       * cygw32.h, cygw32.c (Qutf_16le, from_unicode, to_unicode):
+       In preparation for fixing bug#12739, move these functions from
        here...
 
        * coding.h, coding.c: ... to here, and compile them only when

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2012-11-06 13:26:20 +0000
+++ b/src/xfaces.c      2012-11-08 21:02:10 +0000
@@ -314,16 +314,10 @@
 Lisp_Object Qnormal;
 Lisp_Object Qbold;
 static Lisp_Object Qline, Qwave;
-static Lisp_Object Qultra_light, Qreverse_oblique, Qreverse_italic;
 Lisp_Object Qextra_light, Qlight;
 Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
 Lisp_Object Qoblique;
 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;
 Lisp_Object Qunspecified;      /* used in dosfns.c */
@@ -6451,7 +6445,6 @@
   DEFSYM (Qreleased_button, "released-button");
   DEFSYM (Qpressed_button, "pressed-button");
   DEFSYM (Qnormal, "normal");
-  DEFSYM (Qultra_light, "ultra-light");
   DEFSYM (Qextra_light, "extra-light");
   DEFSYM (Qlight, "light");
   DEFSYM (Qsemi_light, "semi-light");
@@ -6461,16 +6454,6 @@
   DEFSYM (Qultra_bold, "ultra-bold");
   DEFSYM (Qoblique, "oblique");
   DEFSYM (Qitalic, "italic");
-  DEFSYM (Qreverse_oblique, "reverse-oblique");
-  DEFSYM (Qreverse_italic, "reverse-italic");
-  DEFSYM (Qultra_condensed, "ultra-condensed");
-  DEFSYM (Qextra_condensed, "extra-condensed");
-  DEFSYM (Qcondensed, "condensed");
-  DEFSYM (Qsemi_condensed, "semi-condensed");
-  DEFSYM (Qsemi_expanded, "semi-expanded");
-  DEFSYM (Qexpanded, "expanded");
-  DEFSYM (Qextra_expanded, "extra-expanded");
-  DEFSYM (Qultra_expanded, "ultra-expanded");
   DEFSYM (Qbackground_color, "background-color");
   DEFSYM (Qforeground_color, "foreground-color");
   DEFSYM (Qunspecified, "unspecified");