Tweak previous change (don't init statics).

3 files changed, 14 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88346057d5d..659e3a90330 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-16  Glenn Morris  <rgm@gnu.org>
+
+        * ps-print.el (ps-font-size): Doc fix.
+
 2007-08-16  Richard Stallman  <rms@gnu.org>
 
         * emacs-lisp/copyright.el (copyright-names-regexp): Add custom group.
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f006840cbc..7909260228e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,8 +8,8 @@
 
 2007-08-15  Philippe Waroquiers  <philippe.waroquiers@eurocontrol.int>
 
-        * term.c (tty_default_color_capabilities): Explicitly initialize
-        static variables in file scope, to avoid HPUX compiler problem.
+        * term.c (tty_default_color_capabilities): Declare static
+        variables in file scope, to avoid HPUX compiler problem.
 
 2007-08-13  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
diff --git a/src/term.c b/src/term.c
index 3b43163bb57..63455f525da 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2238,15 +2238,15 @@ DEFUN ("tty-display-color-cells", Ftty_display_color_cells,
 
 #ifndef WINDOWSNT
 
-/* Explicitly initialized here rather than in the function to work
-   around an HPUX compiler bug (?). See
+/* Declare here rather than in the function, as in the rest of Emacs,
+   to work around an HPUX compiler bug (?). See
    http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00410.html  */
-static int default_max_colors = 0;
-static int default_max_pairs = 0;
-static int default_no_color_video = 0;
-static char *default_orig_pair = NULL;
-static char *default_set_foreground = NULL;
-static char *default_set_background = NULL;
+static int default_max_colors;
+static int default_max_pairs;
+static int default_no_color_video;
+static char *default_orig_pair;
+static char *default_set_foreground;
+static char *default_set_background;
 
 /* Save or restore the default color-related capabilities of this
    terminal.  */