diff options
| author | Glenn Morris | 2007-08-15 03:20:17 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-15 03:20:17 +0000 |
| commit | fcf8ff2e2eb9cd9f54e4bcaeb36dc0beb0addc6b (patch) | |
| tree | 88245af61f7268635e9a12206c5aa9c613db87ee /src | |
| parent | 980d5def28a1abe890fb29a7e31b43f9faf5b139 (diff) | |
| download | emacs-fcf8ff2e2eb9cd9f54e4bcaeb36dc0beb0addc6b.tar.gz emacs-fcf8ff2e2eb9cd9f54e4bcaeb36dc0beb0addc6b.zip | |
Philippe Waroquiers <philippe.waroquiers at eurocontrol.int>
(tty_default_color_capabilities): Explicitly initialize static
variables in file scope, to avoid HPUX compiler problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e3c212924b3..0ae50d2fa67 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-15 Philippe Waroquiers <philippe.waroquiers@eurocontrol.int> | ||
| 2 | |||
| 3 | * term.c (tty_default_color_capabilities): Explicitly initialize | ||
| 4 | static variables in file scope, to avoid HPUX compiler problem. | ||
| 5 | |||
| 1 | 2007-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 6 | 2007-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (update_frame_tool_bar): Use -1 as index | 8 | * gtkutil.c (update_frame_tool_bar): Use -1 as index |
diff --git a/src/term.c b/src/term.c index 798fc37ca46..624e1c82edd 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -2238,15 +2238,19 @@ DEFUN ("tty-display-color-cells", Ftty_display_color_cells, | |||
| 2238 | 2238 | ||
| 2239 | #ifndef WINDOWSNT | 2239 | #ifndef WINDOWSNT |
| 2240 | 2240 | ||
| 2241 | static int default_max_colors = 0; | ||
| 2242 | static int default_max_pairs = 0; | ||
| 2243 | static int default_no_color_video = 0; | ||
| 2244 | static char *default_orig_pair = NULL; | ||
| 2245 | static char *default_set_foreground = NULL; | ||
| 2246 | static char *default_set_background = NULL; | ||
| 2247 | |||
| 2241 | /* Save or restore the default color-related capabilities of this | 2248 | /* Save or restore the default color-related capabilities of this |
| 2242 | terminal. */ | 2249 | terminal. */ |
| 2243 | static void | 2250 | static void |
| 2244 | tty_default_color_capabilities (save) | 2251 | tty_default_color_capabilities (save) |
| 2245 | int save; | 2252 | int save; |
| 2246 | { | 2253 | { |
| 2247 | static char | ||
| 2248 | *default_orig_pair, *default_set_foreground, *default_set_background; | ||
| 2249 | static int default_max_colors, default_max_pairs, default_no_color_video; | ||
| 2250 | 2254 | ||
| 2251 | if (save) | 2255 | if (save) |
| 2252 | { | 2256 | { |