Mercurial > emacs

comparison src/ChangeLog @ 90054:f2ebccfa87d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74 Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 08 Dec 2004 05:02:30 +0000
parents b637c617432f 9f7c2511d457
children fb79180b618d
comparison
equal deleted inserted replaced
90053:fff5f1a61d92 90054:f2ebccfa87d4
1 2004-12-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
4 reset_malloc_hooks.
5
6 * keyboard.c (handle_async_input, input_available_signal): Add
7 ! defined (SYSTEM_MALLOC) around thread code.
8
9 * alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
10
11 2004-12-07 Stefan <monnier@iro.umontreal.ca>
12
13 * eval.c (init_eval_once): Increase max_specpdl_size to 1000.
14
15 * config.in: Regenerate.
16
17 2004-12-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
18
19 * xmenu.c (Fx_popup_menu): Correct documentation about position.
20 (xmenu_show): Do not call XTranslateCoordinates. Adjust position
21 if not given by a mouse click to correspond with x-popup-menu
22 documentation.
23
24 * config.in: Regenerate.
25
26 * gtkutil.c: Include signal.h and syssignal.h.
27 (xg_get_file_name): Block and unblock __SIGRTMIN if defined.
28
29 * alloc.c: If HAVE_GTK_AND_PTHREAD, include pthread.h,
30 new variables main_thread and alloc_mutex,
31 define (UN)BLOCK_INPUT_ALLOC to use alloc_mutex to protect
32 emacs_blocked_* calls and only do (UN)BLOCK_INPUT in the main thread.
33 If not HAVE_GTK_AND_PTHREAD, (UN)BLOCK_INPUT_ALLOC is the same as
34 (UN)BLOCK_INPUT.
35 (emacs_blocked_free, emacs_blocked_malloc)
36 (emacs_blocked_realloc): Use (UN)BLOCK_INPUT_ALLOC.
37 (uninterrupt_malloc): Initialize main_thread and alloc_mutex.
38 (reset_malloc_hooks): New function.
39
40 * lisp.h: Declare reset_malloc_hooks.
41
42 * emacs.c (Fdump_emacs): Call reset_malloc_hooks.
43
44 * keyboard.c: Conditionally include pthread.h
45 (handle_async_inpu, input_available_signalt): If not in the main
46 thread, block signal, send signal to main thread and return.
47
48 * gtkutil.c (xg_get_file_with_chooser): Handle local files only.
49 Set current folder in file chooser if default_filename is a
50 directory.
51
52 2004-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
53
54 * regex.c (GET_UNSIGNED_NUMBER): Signal an error when reaching the end.
55 Remove redundant correctness checks.
56 (regex_compile): Fix up error codes for \{..\} expressions.
57
58 2004-12-05 Richard M. Stallman <rms@gnu.org>
59
60 * regex.c (regex_compile): Fix end-of-pattern case for space.
61
62 2004-12-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
63
64 * macterm.h (cfstring_create_with_utf8_cstring): Add prototype.
65 * mac.c (cfstring_create_with_utf8_cstring): Add to prevent
66 crashes with invalid characters.
67 * macmenu.c (add_menu_item): Use it.
68 * image.c (image_load_quartz2d): Likewise.
69 * macfns.c (x_set_name, x_set_title): Likewise.
70 (Fx_file_dialog): Likewise. Use constant CFRefs instead of
71 creating them each time for labels.
72
73 2004-12-02 Richard M. Stallman <rms@gnu.org>
74
75 * config.in (RE_TRANSLATE_P): If make_number is not a macro,
76 don't use it here.
77
78 * eval.c (Fcalled_interactively_p): Don't check INTERACTIVE.
79 (interactive_p): Skip Scalled_interactively_p frames
80 like Sinteractive_p frames.
81
82 * data.c (Fmake_variable_buffer_local): Doc fix.
83 (Fmake_local_variable): Doc fix.
84
85 * insdel.c (insert_from_string_before_markers)
86 (insert_from_string): Don't modify buffer on empty insertion.
87
88 * window.c (Fget_lru_window, Fget_largest_window): Doc fixes.
89
90 2004-12-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
91
92 * macmenu.c (add_menu_item): Fallback on MacRoman if encoding
93 menu text as UTF8 fails.
94
95 2004-12-01 Kim F. Storm <storm@cua.dk>
96
97 * alloc.c: Add commentary for last change.
98 (XMALLOC_PUT_SIZE, XMALLOC_GET_SIZE): New macros to handle
99 sizeof(size_t) != 4.
100 (overrun_check_malloc, overrun_check_realloc, overrun_check_free):
101 Use them. Also clear header and trailer of freed memory.
102 (GC_STRING_OVERRUN_COOKIE_SIZE): Rename from GC_STRING_EXTRA.
103 (string_overrun_cookie): Rename from string_overrun_pattern.
104 (GC_STRING_EXTRA): Define from GC_STRING_OVERRUN_COOKIE_SIZE.
105
106 2004-12-01 Andreas Schwab <schwab@suse.de>
107
108 * lisp.h: Declare string_to_multibyte.
109
110 2004-12-01 Kenichi Handa <handa@m17n.org>
111
112 * w32console.c (w32con_write_glyphs): Decide coding here.
113 Adjusted for the change of encode_terminal_code.
114
115 * term.c (encode_terminal_code): Don't make it "static".
116
117 2004-11-30 Kenichi Handa <handa@m17n.org>
118
119 * term.c (encode_terminal_buf, encode_terminal_bufsize): New variables.
120 (encode_terminal_code): Argument changed. Encode all
121 characters at once, and return a pointer to the result of encoding.
122 (write_glyphs): Decide coding here. Adjusted for the above change.
123 (insert_glyphs): Likewise.
124 (term_init): Initialize encode_terminal_bufsize to 0.
125
126 * coding.c (Vcode_conversion_workbuf_name): New variable.
127 (syms_of_coding): Initialize and staticpro it.
128 (set_conversion_work_buffer): New function.
129 (run_pre_post_conversion_on_str): Use it.
130 (run_pre_write_conversin_on_c_str): New function.
131
132 * coding.h (run_pre_write_conversin_on_c_str): Extern it.
133
134 2004-11-30 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
135
136 * keyboard.c: Don't undef SIGIO
137 * s/darwin.h (NO_SOCK_SIGIO): Define NO_SOCK_SIGIO on carbon
138 * Makefile.in (mac.o): Depend on blockinput.h and atimer.h.
139 (macfns.o): Don't depend on ccl.h.
140 * macfns.c (mac_frame_parm_handlers): Set handlers for
141 Qleft_fringe and Qright_fringe.
142 * macterm.c (mac_fill_rectangle_to_pixmap)
143 (mac_draw_rectangle_to_pixmap, mac_copy_area_to_pixmap)
144 (mac_copy_area_with_mask_to_pixmap, x_draw_image_foreground_1):
145 Put in #if 0.
146 (mac_scroll_area) [TARGET_API_MAC_CARBON]: Use ScrollWindowRect.
147 (x_flush) [TARGET_API_MAC_CARBON]: Don't traverse frames.
148 (XFlush) [TARGET_API_MAC_CARBON]: Define to an empty replacement.
149 (x_draw_glyph_string_background, x_draw_glyph_string_foreground)
150 [!MAC_OS8]: Added ifdef'd out code for os8. Don't use
151 XDrawImageString. Always draw background and foreground separately.
152 (x_draw_image_foreground): Use clipping instead of computing the
153 intersection rectangle.
154 (x_draw_image_glyph_string): Don't draw an image with mask to a
155 pixmap.
156 (x_redisplay_interface): Set flush_display_optional member to 0.
157 (XTread_socket): Correctly reset the TEConverter
158 object.
159
160 2004-11-30 Kim F. Storm <storm@cua.dk>
161
162 * lisp.h: New defines to enable buffer overrun checking.
163 (GC_CHECK_STRING_OVERRUN, GC_CHECK_STRING_FREE_LIST)
164 (XMALLOC_OVERRUN_CHECK, GC_CHECK_CONS_LIST): Add.
165
166 * alloc.c: Add more checks for buffer overruns.
167 (XMALLOC_OVERRUN_CHECK_SIZE, xmalloc_overrun_check_header)
168 xmalloc_overrun_check_trailer, overrun_check_malloc)
169 overrun_check_realloc, overrun_check_free): Add.
170 (GC_STRING_EXTRA, string_overrun_pattern): Add.
171 (check_sblock, allocate_string_data, compact_small_strings):
172 Set and check string_overrun_pattern if GC_CHECK_STRING_OVERRUN.
173 (check_cons_list): Condition on GC_CHECK_CONS_LIST.
174 (check_string_free_list): Add.
175 (allocate_string, sweep_strings): Call check_string_free_list.
176
177 * emacs.c (malloc_initialize_hook): Don't free malloc_state_ptr if
178 XMALLOC_OVERRUN_CHECK to avoid crash during load.
179
180 2004-11-29 Kim F. Storm <storm@cua.dk>
181
182 * fns.c (concat): Use SAFE_ALLOCA.
183
184 2004-11-29 Stefan Monnier <monnier@iro.umontreal.ca>
185
186 * sysdep.c (emacs_write): Don't use QUIT.
187
188 2004-11-29 Kenichi Handa <handa@m17n.org>
189
190 * buffer.c (init_buffer): Set current_buffer->directory to a
191 multibyte string made by string_to_multibyte.
192
193 * emacs.c (init_cmdargs): Set unibyte strings in Vcommand_line_args.
194
195 2004-11-27 Andreas Schwab <schwab@suse.de>
196
197 * alloc.c (mark_stack): Call GC_MARK_SECONDARY_STACK if defined.
198
199 * s/gnu-linux.h: Enable no-op gcpros on ia64.
200 (GC_MARK_SECONDARY_STACK) [__ia64__]: Define.
201
202 * filelock.c (lock_file_1): Call get_boot_time early.
203 Increase buffer size.
204
205 2004-11-27 Eli Zaretskii <eliz@gnu.org>
206
207 * lisp.h (DECL_ALIGN): Define non-trivially only if NO_DECL_ALIGN
208 is not defined.
209
210 2004-11-27 Kim F. Storm <storm@cua.dk>
211
212 * search.c (syms_of_search) <search-spaces-regexp>: Move 'doc:'
213 marker out of doc string.
214
215 2004-11-26 Stefan Monnier <monnier@iro.umontreal.ca>
216
217 * s/darwin.h (POSIX_SIGNALS): Undo the removal of 2002-08-25,
218 which was not mentioned in the log.
219
220 2004-11-26 Kim F. Storm <storm@cua.dk>
221
222 * fringe.c (update_window_fringes): Prefer truncation bitmaps over
223 angle bitmaps at top/bottom line.
224
225 * xdisp.c: Undo recent changes for restoring saved_face_id. Instead,
226 set it when it->method is set to next_element_from_display_vector.
227 (setup_for_ellipsis): Add LEN argument. Callers changed.
228 Set it->saved_face_id.
229 (get_next_display_element): Use loop instead of recursion.
230 Set it->saved_face_id. Combine duplicate code for ctr chars.
231 (next_element_from_display_vector): Do not set it->saved_face_id.
232 (next_element_from_ellipsis): Use setup_for_ellipsis.
233
234 2004-11-26 Eli Zaretskii <eliz@gnu.org>
235
236 * eval.c (Fdefvar): Declare pdl from last change as `volatile' to
237 prevent compiler warnings.
238
239 2004-11-25 Stefan Monnier <monnier@iro.umontreal.ca>
240
241 * keyboard.c (command_loop_1): Print a message describing the key
242 the user just pressed when this key has no binding.
243
244 * sysdep.c (sys_signal): Don't use SA_RESTART if SYNC_INPUT is set.
245 (emacs_open, emacs_read, emacs_write): Check QUIT when interrupted.
246
247 * lread.c (readchar): Check QUIT when `getc' is interrupted.
248
249 2004-11-24 Richard M. Stallman <rms@gnu.org>
250
251 * coding.c (run_pre_post_conversion_on_str): Bind Qinhibit_read_only.
252
253 * buffer.c (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
254
255 2004-11-24 Kim F. Storm <storm@cua.dk>
256
257 * xdisp.c (move_it_in_display_line_to, display_line):
258 Restore saved_face_id also when truncate-lines or hscrolled.
259
260 2004-11-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
261
262 * gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
263 x-use-old-gtk-file-dialog.
264
265 * xfns.c: Define x_use_old_gtk_file_dialog.
266 (syms_of_xfns): Rename use-old-gtk-file-dialog to x-... Move it
267 outside ifdef USE_GTK.
268
269 2004-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
270
271 * coding.h (ENCODE_FILE, DECODE_FILE, ENCODE_SYSTEM, DECODE_SYSTEM):
272 Don't use XFASTINT blindly.
273
274 * config.in (RE_TRANSLATE_P): Don't use XFASTINT blindly.
275
276 * indent.c (skip_invisible): Avoid non-idempotent side-effects
277 in macro arguments.
278
279 * keymap.c (Flookup_key): Check INTEGERP before XINT.
280
281 * lread.c (oblookup): Don't use XFASTINT blindly.
282
283 * window.c (Fset_window_scroll_bars): Don't use XINT if it isn't int.
284 (decode_next_window_args, window_loop): Don't use XFASTINT blindly.
285
286 2004-11-23 Kim F. Storm <storm@cua.dk>
287
288 * dispextern.h (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P)
289 (MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P): Not if dpvec_index is zero.
290
291 * xfaces.c (lookup_named_face): Add signal_p arg. Return -1 if
292 signal_p is zero and face name is unknown.
293 (Fx_list_fonts): Don't signal error in lookup_named_face.
294 (Fface_font): Signal error in lookup_named_face.
295 (ascii_face_of_lisp_face): Likewise.
296
297 * dispextern.h (lookup_named_face): Fix prototype.
298
299 * xdisp.c (handle_single_display_prop): Don't signal error in
300 lookup_named_face for unknown fringe face name.
301 (highlight_trailing_whitespace): Don't signal error in
302 lookup_named_face if trailing-whitespace face unknown.
303 (calc_line_height_property): Don't signal error in
304 lookup_named_face if specified face name is unknown.
305
306 * fringe.c (update_window_fringes): Show top row indicator if
307 window has header-line. Don't show arrow at bob and eob
308 if the boundary indicators are not used.
309 (Fset_fringe_bitmap_face): Signal error in lookup_named_face.
310
311 * window.c (set_window_buffer): Clear display_error_modiff.
312
313 2004-11-22 Kim F. Storm <storm@cua.dk>
314
315 * fringe.c (update_window_fringes): Provide sensible fall-back
316 value for non-nil indicate-buffer-boundaries setting.
317
318 2004-11-22 Markus Rost <rost@ias.edu>
319
320 * minibuf.c (Fminibuffer_complete_and_exit): Fix previous change.
321
322 2004-11-22 Stefan Monnier <monnier@iro.umontreal.ca>
323
324 * eval.c (Fdefvar): Warn when var is let-bound but globally void.
325
326 2004-11-21 Kim F. Storm <storm@cua.dk>
327
328 * xdisp.c (erase_phys_cursor): Clear hollow cursor inside TEXT_AREA.
329
330 * xterm.c (x_clip_to_row): Add area arg. Callers changed.
331 (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
332
333 * w32term.c (w32_clip_to_row): Add area arg. Callers changed.
334 (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
335
336 * macterm.c (x_clip_to_row): Add area arg. Callers changed.
337 (x_draw_hollow_cursor, x_draw_bar_cursor): Clip to TEXT_AREA.
338
339 * xdisp.c (move_it_in_display_line_to, display_line):
340 Restore saved_face_id if overflow-newline-into-fringe is enabled and
341 line is continued before or in middle of element from display vector.
342
343 * indent.c (Fvertical_motion): Fix last change. Use another
344 method to detect if iterator moved too far ahead after reseat.
345
346 * xdisp.c (IT_EXPAND_MATRIX_WIDTH): New macro. Do not
347 expand matrix width for overflow in zero-width area.
348 (append_glyph, append_composite_glyph, produce_image_glyph)
349 (append_stretch_glyph): Use it to avoid loop in redisplay.
350 (note_mode_line_or_margin_highlight): Don't let help-echo from
351 string override help-echo from image map.
352
353 2004-11-20 Luc Teirlinck <teirllm@auburn.edu>
354
355 * fns.c (Fyes_or_no_p): Call Fread_from_minibuffer with extra argument.
356 * callint.c (Fcall_interactively): Ditto.
357
358 2004-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
359
360 * minibuf.c (Fminibuffer_complete_and_exit):
361 Fixup the case of the completed value, for case-indep completion.
362
363 2004-11-20 Richard M. Stallman <rms@gnu.org>
364
365 * lisp.h (Fread_from_minibuffer): Add arg in decl.
366
367 * minibuf.c (read_minibuf): New arg KEEP_ALL. Callers changed.
368 (Fread_from_minibuffer): New arg KEEP_ALL. Callers changed.
369
370 * search.c (Vsearch_spaces_regexp):
371 Rename from Vsearch_whitespace_regexp. All uses changed.
372
373 2004-11-20 Thien-Thi Nguyen <ttn@gnu.org>
374
375 * eval.c (init_eval_once): Increase `max_specpdl_size' to 650.
376
377 2004-11-19 Richard M. Stallman <rms@gnu.org>
378
379 * search.c (Vsearch_whitespace_regexp): New variable.
380 (syms_of_search): Defvar it.
381 (compile_pattern_1): Call re_set_whitespace_regexp with it.
382 (search_buffer): No regexp is trivial if Vsearch_whitespace_regexp
383 is non-nil.
384 (struct regexp_cache): New element whitespace_regexp.
385 (syms_of_search): Initialize whitespace_regexp elements.
386 (compile_pattern): Compare whitespace_regexp elements.
387 (compile_pattern_1): Set whitespace_regexp elements.
388
389 * regex.c (regex_compile): Substitute whitespace_regexp
390 for spaces, if it is nonzero.
391 (whitespace_regexp): New variable.
392 (re_set_whitespace_regexp): New function.
393
394 2004-11-19 Kim F. Storm <storm@cua.dk>
395
396 * indent.c (Fvertical_motion): Fix last change.
397
1 2004-11-18 Kim F. Storm <storm@cua.dk> 398 2004-11-18 Kim F. Storm <storm@cua.dk>
2 399
3 * indent.c (Fvertical_motion): Undo 2004-11-16 change. 400 * indent.c (Fvertical_motion): Undo 2004-11-16 change.
4 Instead, move back again if reseating moves too far ahead. 401 Instead, move back again if reseating moves too far ahead.
5 402
11 408
12 * xdisp.c (erase_phys_cursor): Adjust cursor row visible height. 409 * xdisp.c (erase_phys_cursor): Adjust cursor row visible height.
13 410
14 2004-11-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 411 2004-11-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
15 412
16 * gtkutil.c (xg_get_file_name): Fix typo in 413 * gtkutil.c (xg_get_file_name): Typo in HAVE_GTK_FILE_SELECTION_NEW.
17 HAVE_GTK_FILE_SELECTION_NEW.
18 414
19 * xmenu.c (x_menu_in_use): Remove. 415 * xmenu.c (x_menu_in_use): Remove.
20 (x_menu_set_in_use): Also set popup_activated_flag. 416 (x_menu_set_in_use): Also set popup_activated_flag.
21 417
22 * xfns.c (Fx_file_dialog): Call popup_activated instead of 418 * xfns.c (Fx_file_dialog): Call popup_activated instead of
6260 6656
6261 * lread.c (openp): Make sure STR is a string. 6657 * lread.c (openp): Make sure STR is a string.
6262 6658
6263 2003-06-01 David Ponce <david@dponce.com> 6659 2003-06-01 David Ponce <david@dponce.com>
6264 6660
6265 * termhooks.h (enum event_kind): Added new WHEEL_EVENT event. 6661 * termhooks.h (enum event_kind): Add new WHEEL_EVENT event.
6266 Declare MOUSE_WHEEL_EVENT only if MAC_OSX defined. 6662 Declare MOUSE_WHEEL_EVENT only if MAC_OSX defined.
6267 6663
6268 * keyboard.c (Qmouse_wheel): Declare only if MAC_OSX defined. 6664 * keyboard.c (Qmouse_wheel): Declare only if MAC_OSX defined.
6269 (mouse_wheel_syms, lispy_mouse_wheel_names): Likewise. 6665 (mouse_wheel_syms, lispy_mouse_wheel_names): Likewise.
6270 (discard_mouse_events): Discard WHEEL_EVENT events too. 6666 (discard_mouse_events): Discard WHEEL_EVENT events too.
6271 (lispy_wheel_names, wheel_syms): New. 6667 (lispy_wheel_names, wheel_syms): New.
6272 (syms_of_keyboard): Init and staticpro `wheel_syms'. Init and 6668 (syms_of_keyboard): Init and staticpro `wheel_syms'. Init and
6273 staticpro `Qmouse_wheel' and `mouse_wheel_syms' only if MAC_OSX 6669 staticpro `Qmouse_wheel' and `mouse_wheel_syms' only if MAC_OSX defined.
6274 defined.
6275 (make_lispy_event): Add WHEEL_EVENT handler. 6670 (make_lispy_event): Add WHEEL_EVENT handler.
6276 6671
6277 * w32term.c (construct_mouse_wheel): Construct WHEEL_EVENT. 6672 * w32term.c (construct_mouse_wheel): Construct WHEEL_EVENT.
6278 (w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs 6673 (w32_read_socket): Map w32 WM_MOUSEWHEEL events to Emacs
6279 WHEEL_EVENT events. 6674 WHEEL_EVENT events.
6311 * coding.c (ccl_coding_driver): Set ccl->eight_bit_control 6706 * coding.c (ccl_coding_driver): Set ccl->eight_bit_control
6312 properly before calling ccl_driver. 6707 properly before calling ccl_driver.
6313 6708
6314 * ccl.h (struct ccl_program) <eight_bit_control>: Comment fixed. 6709 * ccl.h (struct ccl_program) <eight_bit_control>: Comment fixed.
6315 6710
6316 * ccl.c (CCL_WRITE_CHAR): Increment extra_bytes only when it is 6711 * ccl.c (CCL_WRITE_CHAR): Increment extra_bytes only when it is nonzero.
6317 nonzero.
6318 (ccl_driver): Initialize extra_bytes to ccl->eight_bit_control. 6712 (ccl_driver): Initialize extra_bytes to ccl->eight_bit_control.
6319 (setup_ccl_program): Initialize ccl->eight_bit_control to zero. 6713 (setup_ccl_program): Initialize ccl->eight_bit_control to zero.
6320 6714
6321 2003-05-29 Glenn Morris <gmorris@ast.cam.ac.uk> 6715 2003-05-29 Glenn Morris <gmorris@ast.cam.ac.uk>
6322 6716
6328 * coding.c (decode_coding_iso2022): Pay attention to the byte 6722 * coding.c (decode_coding_iso2022): Pay attention to the byte
6329 sequence of CTEXT extended segment, and retain those bytes as is. 6723 sequence of CTEXT extended segment, and retain those bytes as is.
6330 6724
6331 2003-05-28 Kenichi Handa <handa@m17n.org> 6725 2003-05-28 Kenichi Handa <handa@m17n.org>
6332 6726
6333 * coding.c (ENCODE_UNSAFE_CHARACTER): Adjusted for the name change 6727 * coding.c (ENCODE_UNSAFE_CHARACTER): Adjust for the name change
6334 of CODING_REPLACEMENT_CHARACTER. 6728 of CODING_REPLACEMENT_CHARACTER.
6335 (decode_coding_iso2022): If CODING_FLAG_ISO_SAFE, set 6729 (decode_coding_iso2022): If CODING_FLAG_ISO_SAFE, set
6336 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in coding->mode, and 6730 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in coding->mode, and
6337 check this flag on encoding. 6731 check this flag on encoding.
6338 (encode_coding_sjis_big5): Check 6732 (encode_coding_sjis_big5):
6339 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag of coding->mode. 6733 Check CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag of coding->mode.
6340 (Fset_terminal_coding_system_internal): Set 6734 (Fset_terminal_coding_system_internal):
6341 CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in terminal_coding.mode 6735 Set CODING_MODE_INHIBIT_UNENCODABLE_CHAR flag in terminal_coding.mode
6342 instead of setting CODING_FLAG_ISO_SAFE flag in 6736 instead of setting CODING_FLAG_ISO_SAFE flag in terminal_coding.flags.
6343 terminal_coding.flags. 6737
6344 6738 * coding.h (CODING_REPLACEMENT_CHARACTER): Rename from
6345 * coding.h (CODING_REPLACEMENT_CHARACTER): Renamed from
6346 CODING_INHIBIT_CHARACTER_SUBSTITUTION. 6739 CODING_INHIBIT_CHARACTER_SUBSTITUTION.
6347 (CODING_MODE_INHIBIT_UNENCODABLE_CHAR): New macro. 6740 (CODING_MODE_INHIBIT_UNENCODABLE_CHAR): New macro.
6348 6741
6349 2003-05-28 Richard M. Stallman <rms@gnu.org> 6742 2003-05-28 Richard M. Stallman <rms@gnu.org>
6350 6743
6482 config_scroll_bar_width, and scroll_bar_cols to 6875 config_scroll_bar_width, and scroll_bar_cols to
6483 config_scroll_bar_cols. All uses changed. 6876 config_scroll_bar_cols. All uses changed.
6484 (struct frame): New member scroll_bar_actual_width which 6877 (struct frame): New member scroll_bar_actual_width which
6485 consolidates and renames the vertical_scroll_bar_extra member of 6878 consolidates and renames the vertical_scroll_bar_extra member of
6486 x_output, w32_output, and mac_output structures. All uses changed. 6879 x_output, w32_output, and mac_output structures. All uses changed.
6487 (FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved 6880 (FRAME_PIXEL_HEIGHT): Rename from PIXEL_HEIGHT and moved
6488 from x/w32/macterm.h files. All uses changed. Also change code 6881 from x/w32/macterm.h files. All uses changed. Also change code
6489 which referred to f->output_data...->pixel_height. 6882 which referred to f->output_data...->pixel_height.
6490 (FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved 6883 (FRAME_PIXEL_WIDTH): Rename from PIXEL_WIDTH and moved
6491 from x/w32/macterm.h files. All uses changed. Also change code 6884 from x/w32/macterm.h files. All uses changed. Also change code
6492 which referred to f->output_data...->pixel_width. 6885 which referred to f->output_data...->pixel_width.
6493 (FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed. 6886 (FRAME_LINES): Rename from FRAME_HEIGHT. All uses changed.
6494 Also change code which referred to f->height. 6887 Also change code which referred to f->height.
6495 (FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed. 6888 (FRAME_COLS): Rename from FRAME_WIDTH. All uses changed.
6496 Also change code which referred to f->width. 6889 Also change code which referred to f->width.
6497 (FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses 6890 (FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
6498 to update new_text_lines and new_text_cols members directly. 6891 to update new_text_lines and new_text_cols members directly.
6499 (FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from 6892 (FRAME_CONFIG_SCROLL_BAR_WIDTH): Rename from
6500 FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed. 6893 FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
6501 (FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from 6894 (FRAME_CONFIG_SCROLL_BAR_COLS): Rename from
6502 FRAME_SCROLL_BAR_COLS. All uses changed. 6895 FRAME_SCROLL_BAR_COLS. All uses changed.
6503 (FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS): 6896 (FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
6504 Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and 6897 Rename from FRAME_LEFT_SCROLL_BAR_WIDTH and
6505 FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed. 6898 FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
6506 (FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH) 6899 (FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
6507 (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros. 6900 (FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
6508 (FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH. 6901 (FRAME_TOTAL_COLS): Rename from FRAME_WINDOW_WIDTH.
6509 (SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH. 6902 (SET_FRAME_COLS): Rename from SET_FRAME_WIDTH.
6510 (FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG. 6903 (FRAME_TOTAL_COLS_ARG): Rename from FRAME_WINDOW_WIDTH_ARG.
6511 (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro. 6904 (WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
6512 (WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro. 6905 (WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
6513 (FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally 6906 (FRAME_LINE_HEIGHT): Rename from CANON_Y_UNIT.
6514 return line_height member (it now has proper value also for 6907 Unconditionally return line_height member (it now has proper value
6515 non-window frames). 6908 also for non-window frames).
6516 (FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally 6909 (FRAME_COLUMN_WIDTH): Rename from CANON_X_UNIT. Unconditionally
6517 return new column_width member (rather than the default font width). 6910 return new column_width member (rather than the default font width).
6518 (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH) 6911 (FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
6519 (FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved 6912 (FRAME_RIGHT_FRINGE_WIDTH): Rename from FRAME_X_... and moved
6520 from x/w32/macterm.h files. Unconditionally return corresponding 6913 from x/w32/macterm.h files. Unconditionally return corresponding
6521 member of frame structure (they now have proper values also for 6914 member of frame structure (they now have proper values also for
6522 non-window frames). 6915 non-window frames).
6523 (FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH. 6916 (FRAME_TOTAL_FRINGE_WIDTH): Rename from FRAME_FRINGE_WIDTH.
6524 Calculate return value from left and right widths. 6917 Calculate return value from left and right widths.
6525 (FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return 6918 (FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
6526 internal_border_width member (has proper value for non-window frame). 6919 internal_border_width member (has proper value for non-window frame).
6527 (FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X. 6920 (FRAME_PIXEL_X_FROM_CANON_X): Rename from PIXEL_X_FROM_CANON_X.
6528 (FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y. 6921 (FRAME_PIXEL_Y_FROM_CANON_Y): Rename from PIXEL_Y_FROM_CANON_Y.
6529 (FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X. 6922 (FRAME_CANON_X_FROM_PIXEL_X): Rename from CANON_X_FROM_PIXEL_X.
6530 (FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y. 6923 (FRAME_CANON_Y_FROM_PIXEL_Y): Rename from CANON_Y_FROM_PIXEL_Y.
6531 (FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW, 6924 (FRAME_LINE_TO_PIXEL_Y): Rename from CHAR_TO_PIXEL_ROW,
6532 consolidated from xterm.h, macterm.h, and w32term.h. 6925 consolidated from xterm.h, macterm.h, and w32term.h.
6533 (FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL, 6926 (FRAME_COL_TO_PIXEL_X): Rename from CHAR_TO_PIXEL_COL,
6534 consolidated from xterm.h, macterm.h, and w32term.h. 6927 consolidated from xterm.h, macterm.h, and w32term.h.
6535 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from 6928 (FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rename from
6536 CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h. 6929 CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
6537 (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from 6930 (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Rename from
6538 CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h. 6931 CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
6539 (FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW 6932 (FRAME_PIXEL_Y_TO_LINE): Rename from PIXEL_TO_CHAR_ROW
6540 consolidated from x/mac/w32term.h. 6933 consolidated from x/mac/w32term.h.
6541 (FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL 6934 (FRAME_PIXEL_X_TO_COL): Rename from PIXEL_TO_CHAR_COL
6542 consolidated from x/mac/w32term.h. 6935 consolidated from x/mac/w32term.h.
6543 (FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from 6936 (FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Rename from
6544 PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h. 6937 PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
6545 (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from 6938 (FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Rename from
6546 PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h. 6939 PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
6547 6940
6548 * window.h (struct window): Rename members left to left_col, 6941 * window.h (struct window): Rename members left to left_col,
6549 top to top_line, height to total_lines, width to total_cols, 6942 top to top_line, height to total_lines, width to total_cols,
6550 left_margin_width to left_margin_cols, right_margin_width to 6943 left_margin_width to left_margin_cols, right_margin_width to
6562 referred to XINT (w->width) * canon_x_unit. 6955 referred to XINT (w->width) * canon_x_unit.
6563 (WINDOW_TOTAL_HEIGHT): New macro. Change relevant code that 6956 (WINDOW_TOTAL_HEIGHT): New macro. Change relevant code that
6564 referred to XINT (w->height) * canon_y_unit. 6957 referred to XINT (w->height) * canon_y_unit.
6565 (WINDOW_LEFT_EDGE_COL): New macro. Change relevant code that 6958 (WINDOW_LEFT_EDGE_COL): New macro. Change relevant code that
6566 referred to XINT (w->left). 6959 referred to XINT (w->left).
6567 (WINDOW_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_EDGE. Change 6960 (WINDOW_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_EDGE. Change
6568 all uses and code that referred to XINT (w->left) + XINT (w->width). 6961 all uses and code that referred to XINT (w->left) + XINT (w->width).
6569 (WINDOW_TOP_EDGE_LINE): New macro. Change relevant code that 6962 (WINDOW_TOP_EDGE_LINE): New macro. Change relevant code that
6570 referred to XINT (w->top). 6963 referred to XINT (w->top).
6571 (WINDOW_BOTTOM_EDGE_LINE): New macro. Change relevant code that 6964 (WINDOW_BOTTOM_EDGE_LINE): New macro. Change relevant code that
6572 referred to XINT (w->top) + XINT (w->height). 6965 referred to XINT (w->top) + XINT (w->height).
6577 (WINDOW_TOP_EDGE_Y): New macro. Change relevant code that 6970 (WINDOW_TOP_EDGE_Y): New macro. Change relevant code that
6578 referred to XINT (w->top) * canon_y_unit. 6971 referred to XINT (w->top) * canon_y_unit.
6579 (WINDOW_BOTTOM_EDGE_Y): New macro. Change relevant code that 6972 (WINDOW_BOTTOM_EDGE_Y): New macro. Change relevant code that
6580 referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit. 6973 referred to (XINT (w->top) + XINT (w->height)) * canon_y_unit.
6581 (WINDOW_LEFTMOST_P): New macro. 6974 (WINDOW_LEFTMOST_P): New macro.
6582 (WINDOW_BOX_LEFT_EDGE_COL): Renamed from WINDOW_LEFT_MARGIN. 6975 (WINDOW_BOX_LEFT_EDGE_COL): Rename from WINDOW_LEFT_MARGIN.
6583 All uses changed. 6976 All uses changed.
6584 (WINDOW_BOX_RIGHT_EDGE_COL): Renamed from WINDOW_RIGHT_MARGIN. 6977 (WINDOW_BOX_RIGHT_EDGE_COL): Rename from WINDOW_RIGHT_MARGIN.
6585 All uses changed. 6978 All uses changed.
6586 (WINDOW_BOX_LEFT_EDGE_X): Renamed from 6979 (WINDOW_BOX_LEFT_EDGE_X): Rename from
6587 WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h. 6980 WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X, moved from dispextern.h.
6588 Do not exclude left fringe width. 6981 Do not exclude left fringe width.
6589 (WINDOW_BOX_RIGHT_EDGE_X): Renamed from 6982 (WINDOW_BOX_RIGHT_EDGE_X): Rename from
6590 WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h. 6983 WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X, moved from dispextern.h.
6591 Do not exclude fringe widths. 6984 Do not exclude fringe widths.
6592 (WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH) 6985 (WINDOW_LEFT_FRINGE_WIDTH, WINDOW_RIGHT_FRINGE_WIDTH)
6593 (WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros. 6986 (WINDOW_FRINGE_COLS, WINDOW_TOTAL_FRINGE_WIDTH): New macros.
6594 Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH, 6987 Change relevant code that referred to FRAME_LEFT_FRINGE_WIDTH,
6611 (WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro. Change code 7004 (WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH): New macro. Change code
6612 that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and 7005 that referred to FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT and
6613 FRAME_SCROLL_BAR_WIDTH. 7006 FRAME_SCROLL_BAR_WIDTH.
6614 (WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH) 7007 (WINDOW_SCROLL_BAR_COLS, WINDOW_SCROLL_BAR_AREA_WIDTH)
6615 (WINDOW_SCROLL_BAR_AREA_X): New macros. 7008 (WINDOW_SCROLL_BAR_AREA_X): New macros.
6616 (WINDOW_HEADER_LINE_HEIGHT): Renamed from 7009 (WINDOW_HEADER_LINE_HEIGHT): Rename from
6617 WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h. 7010 WINDOW_DISPLAY_HEADER_LINE_HEIGHT, moved from dispextern.h.
6618 (WINDOW_BOX_HEIGHT_NO_MODE_LINE): Renamed from 7011 (WINDOW_BOX_HEIGHT_NO_MODE_LINE): Rename from
6619 WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h. 7012 WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE, moved from dispextern.h.
6620 (WINDOW_BOX_TEXT_HEIGHT): Renamed from 7013 (WINDOW_BOX_TEXT_HEIGHT): Rename from
6621 WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h. 7014 WINDOW_DISPLAY_PIXEL_WIDTH, moved from dispextern.h.
6622 (WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y) 7015 (WINDOW_TO_FRAME_PIXEL_X, WINDOW_TO_FRAME_PIXEL_Y)
6623 (FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y) 7016 (FRAME_TO_WINDOW_PIXEL_X, FRAME_TO_WINDOW_PIXEL_Y)
6624 (WINDOW_TEXT_TO_FRAME_PIXEL_X): Moved here from dispextern.h. 7017 (WINDOW_TEXT_TO_FRAME_PIXEL_X): Move here from dispextern.h.
6625 (WINDOW_LEFT_MARGIN_WIDTH): Renamed from 7018 (WINDOW_LEFT_MARGIN_WIDTH): Rename from
6626 WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h. 7019 WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH, moved from dispextern.h.
6627 (WINDOW_RIGHT_MARGIN_WIDTH): Renamed from 7020 (WINDOW_RIGHT_MARGIN_WIDTH): Rename from
6628 WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h. 7021 WINDOW_DISPLAY_RIGHT_AREA_PIXEL_WIDTH, moved from dispextern.h.
6629 (window_from_coordinates): Update prototype. 7022 (window_from_coordinates): Update prototype.
6630 (Fset_window_buffer): Update EXFUN. 7023 (Fset_window_buffer): Update EXFUN.
6631 (set_window_buffer): Update prototype. 7024 (set_window_buffer): Update prototype.
6632 7025
6716 new macros in dispextern.h, frame.h and window.h. 7109 new macros in dispextern.h, frame.h and window.h.
6717 (make_window): Initialize new members 7110 (make_window): Initialize new members
6718 left_margin_cols, right_margin_cols, left_fringe_width, 7111 left_margin_cols, right_margin_cols, left_fringe_width,
6719 right_fringe_width, fringes_outside_margins, scroll_bar_width, 7112 right_fringe_width, fringes_outside_margins, scroll_bar_width,
6720 and vertical_scroll_bar_type. 7113 and vertical_scroll_bar_type.
6721 (coordinates_in_window): Adapted to new fringe/margin positions 7114 (coordinates_in_window): Adapt to new fringe/margin positions
6722 and per-window fringes and scroll-bars. 7115 and per-window fringes and scroll-bars.
6723 Fix bug related to incorrectly adjusting coordinates by 7116 Fix bug related to incorrectly adjusting coordinates by
6724 frame's internal_border_width (the effect normally negible since 7117 frame's internal_border_width (the effect normally negible since
6725 the internal_border_width is typically 0 or 1 pixel, but very 7118 the internal_border_width is typically 0 or 1 pixel, but very
6726 noticeable for an internal_border_width of e.g. 25 pixels). 7119 noticeable for an internal_border_width of e.g. 25 pixels).
6751 When splitting horizontally, call adjust_window_margins on both 7144 When splitting horizontally, call adjust_window_margins on both
6752 windows to ensure that the text area of the new windows is non too 7145 windows to ensure that the text area of the new windows is non too
6753 narrow. This fixes a bug which could cause Emacs to trap if the 7146 narrow. This fixes a bug which could cause Emacs to trap if the
6754 width of the split window was less than the width of the display 7147 width of the split window was less than the width of the display
6755 margins. 7148 margins.
6756 (window_box_text_cols): Renamed from window_internal_width. 7149 (window_box_text_cols): Rename from window_internal_width.
6757 All uses changed. Adapt to per-window fringes and scroll bars. 7150 All uses changed. Adapt to per-window fringes and scroll bars.
6758 Fix bug that caused vertical separator to be subtracted also on 7151 Fix bug that caused vertical separator to be subtracted also on
6759 window frames. Fix another bug that did not reduce the returned 7152 window frames. Fix another bug that did not reduce the returned
6760 value by the columns used for display margins. 7153 value by the columns used for display margins.
6761 (window_scroll_line_based): Fix bug related to scrolling too much 7154 (window_scroll_line_based): Fix bug related to scrolling too much
6783 the text area doesn't get too narrow. This fixes a bug which 7176 the text area doesn't get too narrow. This fixes a bug which
6784 could cause Emacs to trap if setting display margins wider than 7177 could cause Emacs to trap if setting display margins wider than
6785 the width of the window. 7178 the width of the window.
6786 (Fset_window_fringes): New defun to allow user to specifically set 7179 (Fset_window_fringes): New defun to allow user to specifically set
6787 this window's fringe widths and position vs. display margins. 7180 this window's fringe widths and position vs. display margins.
6788 (Fwindow_fringes): New defun to return window's actual fringe 7181 (Fwindow_fringes): New defun to return window's actual fringe settings.
6789 settings.
6790 (Fset_window_scroll_bars): New defun to allow user to specifically 7182 (Fset_window_scroll_bars): New defun to allow user to specifically
6791 set this window's scroll bar width and position. 7183 set this window's scroll bar width and position.
6792 (Fwindow_scroll_bars): New defun to return window's actual scroll 7184 (Fwindow_scroll_bars): New defun to return window's actual scroll
6793 bar settings. 7185 bar settings.
6794 (compare_window_configurations): Also compare display margins, 7186 (compare_window_configurations): Also compare display margins,
6851 x_pixels_diff, and y_pixels_diff to struct frame (frame.h). 7243 x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
6852 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7244 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
6853 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7245 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
6854 (PIXEL_WIDTH, PIXEL_HEIGHT) 7246 (PIXEL_WIDTH, PIXEL_HEIGHT)
6855 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7247 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
6856 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7248 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
6857 frame.h and renamed [see frame.h changes]. 7249 frame.h and renamed [see frame.h changes].
6858 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7250 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
6859 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7251 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
6860 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7252 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
6861 and renamed [see frame.h changes]. 7253 and renamed [see frame.h changes].
6862 7254
6863 * xterm.c: Make (several) trivial substitutions for renamed and 7255 * xterm.c: Make (several) trivial substitutions for renamed and
6864 new macros in dispextern.h, frame.h and window.h. 7256 new macros in dispextern.h, frame.h and window.h.
6865 (x_draw_glyph_string_box): Adapt to per-window fringes and 7257 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
6866 scroll-bars.
6867 (scroll_run): Adapt to new fringe position. 7258 (scroll_run): Adapt to new fringe position.
6868 (glyph_rect): Use window coordinates returned from 7259 (glyph_rect): Use window coordinates returned from
6869 window_from_coordinates rather than frame_to_window_pixel_xy. 7260 window_from_coordinates rather than frame_to_window_pixel_xy.
6870 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7261 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
6871 scroll-bars. 7262 scroll-bars.
6885 x_pixels_diff, and y_pixels_diff to struct frame (frame.h). 7276 x_pixels_diff, and y_pixels_diff to struct frame (frame.h).
6886 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7277 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
6887 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7278 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
6888 (PIXEL_WIDTH, PIXEL_HEIGHT) 7279 (PIXEL_WIDTH, PIXEL_HEIGHT)
6889 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7280 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
6890 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7281 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
6891 frame.h and renamed [see frame.h changes]. 7282 frame.h and renamed [see frame.h changes].
6892 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7283 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
6893 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7284 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
6894 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7285 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
6895 and renamed [see frame.h changes]. 7286 and renamed [see frame.h changes].
6896 7287
6897 * w32term.c: Make (several) trivial substitutions for renamed and 7288 * w32term.c: Make (several) trivial substitutions for renamed and
6898 new macros in dispextern.h, frame.h and window.h. 7289 new macros in dispextern.h, frame.h and window.h.
6899 (x_draw_glyph_string_box): Adapt to per-window fringes and 7290 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
6900 scroll-bars.
6901 (glyph_rect): Use window coordinates returned from 7291 (glyph_rect): Use window coordinates returned from
6902 window_from_coordinates rather than frame_to_window_pixel_xy. 7292 window_from_coordinates rather than frame_to_window_pixel_xy.
6903 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7293 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
6904 scroll-bars. 7294 scroll-bars.
6905 (w32_clip_to_row): Remove superfluous whole_line_p arg and code 7295 (w32_clip_to_row): Remove superfluous whole_line_p arg and code
6926 x_pixels_diff, y_pixels_diff to struct frame (frame.h). 7316 x_pixels_diff, y_pixels_diff to struct frame (frame.h).
6927 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h. 7317 (FRAME_INTERNAL_BORDER_WIDTH, FRAME_LINE_HEIGHT): Move to frame.h.
6928 (FRAME_DEFAULT_FONT_WIDTH): Remove macro. 7318 (FRAME_DEFAULT_FONT_WIDTH): Remove macro.
6929 (PIXEL_WIDTH, PIXEL_HEIGHT) 7319 (PIXEL_WIDTH, PIXEL_HEIGHT)
6930 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH) 7320 (FRAME_X_FRINGE_COLS, FRAME_X_FRINGE_WIDTH)
6931 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Moved to 7321 (FRAME_X_LEFT_FRINGE_WIDTH, FRAME_X_RIGHT_FRINGE_WIDTH): Move to
6932 frame.h and renamed [see frame.h changes]. 7322 frame.h and renamed [see frame.h changes].
6933 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH) 7323 (CHAR_TO_PIXEL_ROW, CHAR_TO_PIXEL_COL, CHAR_TO_PIXEL_WIDTH)
6934 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL) 7324 (CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_ROW, PIXEL_TO_CHAR_COL)
6935 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Moved to frame.h 7325 (PIXEL_TO_CHAR_WIDTH, PIXEL_TO_CHAR_HEIGHT): Move to frame.h
6936 and renamed [see frame.h changes]. 7326 and renamed [see frame.h changes].
6937 7327
6938 * macterm.c: Make (several) trivial substitutions for renamed and 7328 * macterm.c: Make (several) trivial substitutions for renamed and
6939 new macros in dispextern.h, frame.h and window.h. 7329 new macros in dispextern.h, frame.h and window.h.
6940 (x_draw_glyph_string_box): Adapt to per-window fringes and 7330 (x_draw_glyph_string_box): Adapt to per-window fringes and scroll-bars.
6941 scroll-bars.
6942 (glyph_rect): Use window coordinates returned from 7331 (glyph_rect): Use window coordinates returned from
6943 window_from_coordinates rather than frame_to_window_pixel_xy. 7332 window_from_coordinates rather than frame_to_window_pixel_xy.
6944 (XTset_vertical_scroll_bar): Adapt to per-window fringes and 7333 (XTset_vertical_scroll_bar): Adapt to per-window fringes and
6945 scroll-bars. 7334 scroll-bars.
6946 (x_clip_to_row): Remove superfluous whole_line_p arg and code 7335 (x_clip_to_row): Remove superfluous whole_line_p arg and code