aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThien-Thi Nguyen2003-03-22 01:35:32 +0000
committerThien-Thi Nguyen2003-03-22 01:35:32 +0000
commitaf0ad939bdb8396a4c0cd3319ed6e32947c2e0f6 (patch)
tree6e839a25b75bf2127473291ae11ccaf079dc67ca /src
parentb0df3884b1cce254c5ae8466fabacab52801b965 (diff)
downloademacs-af0ad939bdb8396a4c0cd3319ed6e32947c2e0f6.tar.gz
emacs-af0ad939bdb8396a4c0cd3319ed6e32947c2e0f6.zip
Make sure space precedes end-of-line backslashes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/Makefile.in10
2 files changed, 13 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b2c9af9a5a5..47f5810abc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12003-03-22 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * Makefile.in: Make sure space precedes end-of-line backslashes.
4
12003-03-22 Kim F. Storm <storm@cua.dk> 52003-03-22 Kim F. Storm <storm@cua.dk>
2 6
3 * xdisp.c (pixel_to_glyph_coords, glyph_to_pixel_coords): 7 * xdisp.c (pixel_to_glyph_coords, glyph_to_pixel_coords):
@@ -24,7 +28,7 @@
24 the output cursor, and help echo from xterm.c, w32term.c and 28 the output cursor, and help echo from xterm.c, w32term.c and
25 macterm.c into xdisp.c. It also generalizes the use of the 29 macterm.c into xdisp.c. It also generalizes the use of the
26 window_part enum instead of using numeric values throughout. 30 window_part enum instead of using numeric values throughout.
27 31
28 * xdisp.c: Consolidate gui-independent code here. 32 * xdisp.c: Consolidate gui-independent code here.
29 Include keymap.h. 33 Include keymap.h.
30 (Qhelp_echo): Import. 34 (Qhelp_echo): Import.
@@ -45,7 +49,7 @@
45 (tool_bar_item_info, notice_overwritten_cursor): Make static. 49 (tool_bar_item_info, notice_overwritten_cursor): Make static.
46 (frame_to_window_pixel_xy, get_glyph_string_clip_rect) 50 (frame_to_window_pixel_xy, get_glyph_string_clip_rect)
47 (set_output_cursor, x_cursor_to, handle_tool_bar_click) 51 (set_output_cursor, x_cursor_to, handle_tool_bar_click)
48 (x_write_glyphs, x_insert_glyphs, x_clear_end_of_line): 52 (x_write_glyphs, x_insert_glyphs, x_clear_end_of_line):
49 (x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor) 53 (x_fix_overlapping_area, draw_phys_cursor_glyph, erase_phys_cursor)
50 (display_and_set_cursor, x_update_cursor, x_clear_cursor) 54 (display_and_set_cursor, x_update_cursor, x_clear_cursor)
51 (show_mouse_face, clear_mouse_face, cursor_in_mouse_face_p) 55 (show_mouse_face, clear_mouse_face, cursor_in_mouse_face_p)
@@ -101,7 +105,7 @@
101 105
102 * xterm.h (No_Cursor): Declare as None for X. 106 * xterm.h (No_Cursor): Declare as None for X.
103 (struct mac_output): Replace member cross_cursor by hand_cursor. 107 (struct mac_output): Replace member cross_cursor by hand_cursor.
104 108
105 * xterm.c: Remove consolidated defines and code. 109 * xterm.c: Remove consolidated defines and code.
106 (BETWEEN): Remove unused macro. 110 (BETWEEN): Remove unused macro.
107 (x_draw_vertical_window_border, x_shift_glyphs_for_insert) 111 (x_draw_vertical_window_border, x_shift_glyphs_for_insert)
@@ -128,7 +132,7 @@
128 * w32fns.c: Remove setup of cross_cursor (already has hand_cursor). 132 * w32fns.c: Remove setup of cross_cursor (already has hand_cursor).
129 133
130 * w32console.c: Remove consolidated defines and code. 134 * w32console.c: Remove consolidated defines and code.
131 135
132 * msdos.h (Display_Info): Add generic typedef. 136 * msdos.h (Display_Info): Add generic typedef.
133 137
134 * msdos.c: Remove consolidated defines and code. 138 * msdos.c: Remove consolidated defines and code.
diff --git a/src/Makefile.in b/src/Makefile.in
index dfcb82a9302..e93cfa0a04f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -572,7 +572,7 @@ XMENU_OBJ = xmenu.o
572/* lastfile must follow all files 572/* lastfile must follow all files
573 whose initialized data areas should be dumped as pure by dump-emacs. */ 573 whose initialized data areas should be dumped as pure by dump-emacs. */
574obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ 574obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
575 charset.o coding.o category.o ccl.o\ 575 charset.o coding.o category.o ccl.o \
576 cm.o term.o xfaces.o $(XOBJ) \ 576 cm.o term.o xfaces.o $(XOBJ) \
577 emacs.o keyboard.o macros.o keymap.o sysdep.o \ 577 emacs.o keyboard.o macros.o keymap.o sysdep.o \
578 buffer.o filelock.o insdel.o marker.o \ 578 buffer.o filelock.o insdel.o marker.o \
@@ -703,7 +703,7 @@ lisp= \
703 ${lispsource}facemenu.elc \ 703 ${lispsource}facemenu.elc \
704 MOUSE_SUPPORT \ 704 MOUSE_SUPPORT \
705 ${lispsource}float-sup.elc \ 705 ${lispsource}float-sup.elc \
706 ${lispsource}frame.elc\ 706 ${lispsource}frame.elc \
707 ${lispsource}help.elc \ 707 ${lispsource}help.elc \
708 ${lispsource}indent.elc \ 708 ${lispsource}indent.elc \
709 ${lispsource}isearch.elc \ 709 ${lispsource}isearch.elc \
@@ -1112,7 +1112,7 @@ getloadavg.o: getloadavg.c $(config_h)
1112indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ 1112indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
1113 termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ 1113 termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \
1114 keyboard.h 1114 keyboard.h
1115insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h\ 1115insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \
1116 dispextern.h atimer.h systime.h $(config_h) 1116 dispextern.h atimer.h systime.h $(config_h)
1117keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \ 1117keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \
1118 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ 1118 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
@@ -1204,7 +1204,7 @@ eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
1204floatfns.o: floatfns.c $(config_h) 1204floatfns.o: floatfns.c $(config_h)
1205fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ 1205fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \
1206 frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h 1206 frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h
1207print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h\ 1207print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \
1208 $(config_h) dispextern.h msdos.h composite.h 1208 $(config_h) dispextern.h msdos.h composite.h
1209lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \ 1209lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \
1210 termhooks.h coding.h msdos.h 1210 termhooks.h coding.h msdos.h
@@ -1253,7 +1253,7 @@ ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings: ${emacsappsrc}Con
1253endif 1253endif
1254 1254
1255macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \ 1255macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \
1256 ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo\ 1256 ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \
1257 ${emacsapp}Contents/Resources/Emacs.icns \ 1257 ${emacsapp}Contents/Resources/Emacs.icns \
1258 ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings 1258 ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
1259macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \ 1259macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \