aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2005-07-11 21:43:20 +0000
committerStefan Monnier2005-07-11 21:43:20 +0000
commita4429c5b7418a7a46149500091cc6d0b674a8760 (patch)
treeac0961bb8a95588d9a2da28da3e2f3b638cb76cd /src
parent51f74c375feb8aac237d5f8987cc8b85e5477813 (diff)
downloademacs-a4429c5b7418a7a46149500091cc6d0b674a8760.tar.gz
emacs-a4429c5b7418a7a46149500091cc6d0b674a8760.zip
(Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog25
-rw-r--r--src/window.c2
2 files changed, 15 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b87da0d2d37..9bd4d68482c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-07-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * window.c (Frecenter): Yet another int/Lisp_Object mixup (YAILOM).
4
12005-07-11 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 52005-07-11 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 6
3 * xfaces.c (x_update_menu_appearance): Use fontSet resource for 7 * xfaces.c (x_update_menu_appearance): Use fontSet resource for
@@ -5,9 +9,9 @@
5 9
62005-07-10 Steven Tamm <steventamm@mac.com> 102005-07-10 Steven Tamm <steventamm@mac.com>
7 11
8 * mac.c (Fmac_get_file_type, Fmac_get_file_creator): Added. 12 * mac.c (Fmac_get_file_type, Fmac_get_file_creator): Add.
9 (Fmac_set_file_type, Fmac_set_file_creator): Added 13 (Fmac_set_file_type, Fmac_set_file_creator): Add.
10 (mac_get_object_from_code, mac_get_code_from_arg): Added 14 (mac_get_object_from_code, mac_get_code_from_arg): Add.
11 15
122005-07-10 Richard M. Stallman <rms@gnu.org> 162005-07-10 Richard M. Stallman <rms@gnu.org>
13 17
@@ -37,7 +41,7 @@
37 41
38 * w32console.c (initialize_w32_display): Detect when the console 42 * w32console.c (initialize_w32_display): Detect when the console
39 dimensions are insane, and default to 80x25 instead. 43 dimensions are insane, and default to 80x25 instead.
40 (w32_use_full_screen_buffer): default to NIL. 44 (w32_use_full_screen_buffer): Default to NIL.
41 45
422005-07-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 462005-07-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
43 47
@@ -45,8 +49,8 @@
45 VERTICAL_BORDER_FACE_ID for vertical border line. 49 VERTICAL_BORDER_FACE_ID for vertical border line.
46 (mac_encode_char): Call check_ccl_update in advance. 50 (mac_encode_char): Call check_ccl_update in advance.
47 (mac_to_x_fontname, x_font_name_to_mac_font_name) 51 (mac_to_x_fontname, x_font_name_to_mac_font_name)
48 (init_font_name_table, mac_do_list_fonts, XLoadQueryFont): Don't 52 (init_font_name_table, mac_do_list_fonts, XLoadQueryFont):
49 assume that font family length is less than 32. 53 Don't assume that font family length is less than 32.
50 (x_compute_min_glyph_bounds): Make static. 54 (x_compute_min_glyph_bounds): Make static.
51 (x_load_font): Never set fonts_changed_p to zero. 55 (x_load_font): Never set fonts_changed_p to zero.
52 56
@@ -97,8 +101,7 @@
97 101
982005-07-01 Masatake YAMATO <jet@gyve.org> 1022005-07-01 Masatake YAMATO <jet@gyve.org>
99 103
100 * emacs.c (main): Passing ADD_NO_RANDOMIZE to 104 * emacs.c (main): Passing ADD_NO_RANDOMIZE to `personality'.
101 `personality'.
102 105
1032005-06-30 Juri Linkov <juri@jurta.org> 1062005-06-30 Juri Linkov <juri@jurta.org>
104 107
@@ -226,7 +229,7 @@
226 229
2272005-06-22 Miles Bader <miles@gnu.org> 2302005-06-22 Miles Bader <miles@gnu.org>
228 231
229 * xfaces.c (Qvertical_border): Renamed from `Qvertical_divider'. 232 * xfaces.c (Qvertical_border): Rename from `Qvertical_divider'.
230 (realize_basic_faces, syms_of_xfaces): Update references to it. 233 (realize_basic_faces, syms_of_xfaces): Update references to it.
231 * dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID' 234 * dispextern.h (enum face_id): Rename `VERTICAL_DIVIDER_FACE_ID'
232 to `VERTICAL_BORDER_FACE_ID'. 235 to `VERTICAL_BORDER_FACE_ID'.
@@ -265,8 +268,8 @@
265 268
2662005-06-17 Richard M. Stallman <rms@gnu.org> 2692005-06-17 Richard M. Stallman <rms@gnu.org>
267 270
268 * xdisp.c (get_next_display_element): Reverse 271 * xdisp.c (get_next_display_element):
269 test of Vshow_nonbreak_escape. 272 Reverse test of Vshow_nonbreak_escape.
270 273
271 * term.c (produce_special_glyphs): Use spec_glyph_lookup_face. 274 * term.c (produce_special_glyphs): Use spec_glyph_lookup_face.
272 (Ftty_no_underline): New function. 275 (Ftty_no_underline): New function.
diff --git a/src/window.c b/src/window.c
index cf1142e3d06..ed4fc9c8ae8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5466,7 +5466,7 @@ and redisplay normally--don't erase and redraw the frame. */)
5466 int ht = window_internal_height (w); 5466 int ht = window_internal_height (w);
5467 5467
5468 if (center_p) 5468 if (center_p)
5469 iarg = make_number (ht / 2); 5469 iarg = ht / 2;
5470 else if (iarg < 0) 5470 else if (iarg < 0)
5471 iarg += ht; 5471 iarg += ht;
5472 5472