aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-16 03:17:12 +0000
committerGlenn Morris2007-08-16 03:17:12 +0000
commitaf9f81a0de809153d8d39e82417f4cdc72d24f33 (patch)
tree752952b22ba088022323722ff5a70ec5dd08aef1
parentfb2336a18b7a6d8aa6a8fbf7fcc4cf46eef98cb5 (diff)
downloademacs-af9f81a0de809153d8d39e82417f4cdc72d24f33.tar.gz
emacs-af9f81a0de809153d8d39e82417f4cdc72d24f33.zip
Tweak previous change (don't init statics).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--src/term.c16
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e9a0798673..067a6291c3e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-08-16 Glenn Morris <rgm@gnu.org>
2
3 * ps-print.el (ps-font-size): Doc fix.
4
12007-08-15 Stefan Monnier <monnier@iro.umontreal.ca> 52007-08-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * vc-bzr.el: Don't fiddle with vc-handled-backend. 7 * vc-bzr.el: Don't fiddle with vc-handled-backend.
diff --git a/src/term.c b/src/term.c
index 8b46243a43a..d829332f55c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2169,15 +2169,15 @@ DEFUN ("tty-display-color-cells", Ftty_display_color_cells,
2169 2169
2170#ifndef WINDOWSNT 2170#ifndef WINDOWSNT
2171 2171
2172/* Explicitly initialized here rather than in the function to work 2172/* Declare here rather than in the function, as in the rest of Emacs,
2173 around an HPUX compiler bug (?). See 2173 to work around an HPUX compiler bug (?). See
2174 http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00410.html */ 2174 http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00410.html */
2175static int default_max_colors = 0; 2175static int default_max_colors;
2176static int default_max_pairs = 0; 2176static int default_max_pairs;
2177static int default_no_color_video = 0; 2177static int default_no_color_video;
2178static char *default_orig_pair = NULL; 2178static char *default_orig_pair;
2179static char *default_set_foreground = NULL; 2179static char *default_set_foreground;
2180static char *default_set_background = NULL; 2180static char *default_set_background;
2181 2181
2182/* Save or restore the default color-related capabilities of this 2182/* Save or restore the default color-related capabilities of this
2183 terminal. */ 2183 terminal. */