[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109427: Fix the MSDOS build as fallo
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109427: Fix the MSDOS build as fallout of latest changes. |
Date: |
Sat, 04 Aug 2012 12:04:22 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109427 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-08-04 12:04:22 +0300
message:
Fix the MSDOS build as fallout of latest changes.
msdos/sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
editing out.
msdos/sed2v2.inp (IS_DEVICE_SEP): Edit to match ':'.
(IS_DIRECTORY_SEP, INTERNAL_TERMINAL): Fix Sed command syntax.
(MSDOS): Define only if undefined, as MSDOS is a built-in macro,
unless some std= switch to GCC is used.
src/msdos.c (dos_set_window_size, IT_update_begin)
(IT_frame_up_to_date, IT_set_frame_parameters): Use FVAR and WVAR
instead of direct references.
modified:
msdos/ChangeLog
msdos/sed2v2.inp
msdos/sedlibmk.inp
src/ChangeLog
src/msdos.c
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2012-08-01 15:43:36 +0000
+++ b/msdos/ChangeLog 2012-08-04 08:58:33 +0000
@@ -1,3 +1,13 @@
+2012-08-04 Eli Zaretskii <address@hidden>
+
+ * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
+ editing out.
+
+ * sed2v2.inp (IS_DEVICE_SEP): Edit to match ':'.
+ (IS_DIRECTORY_SEP, INTERNAL_TERMINAL): Fix Sed command syntax.
+ (MSDOS): Define only if undefined, as MSDOS is a built-in macro,
+ unless some std= switch to GCC is used.
+
2012-08-01 Glenn Morris <address@hidden>
* sed2v2.inp (HAVE_WCHAR_H): Fix typo.
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2012-08-01 15:20:59 +0000
+++ b/msdos/sed2v2.inp 2012-08-04 08:58:33 +0000
@@ -26,7 +26,10 @@
#define NSIG 320\
#endif
-/^#undef MSDOS *$/s/^.*$/#define MSDOS/
+/^#undef MSDOS *$/c\
+#ifndef MSDOS\
+#define MSDOS\
+#endif
/^#undef DOS_NT *$/s/^.*$/#define DOS_NT/
/^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/
/^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/
@@ -85,11 +88,12 @@
/^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define
HAVE_UNSIGNED_LONG_LONG_INT 1/
/^#undef HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/
/^#undef DEVICE_SEP *$/s/^.*$/#define DEVICE_SEP ':'/
-/^#undef IS_DIRECTORY_SEP *$/s/^.*$/#define IS_DIRECTORY_SEP(_c_) ((_c_) ==
'/' || (_c_) == '\\\\')/
+/^#undef IS_DIRECTORY_SEP *$/s,^.*$,#define IS_DIRECTORY_SEP(_c_) ((_c_) ==
'/' || (_c_) == '\\\\'),
+/^#undef IS_DEVICE_SEP *$/s/^.*$/#define IS_DEVICE_SEP(_c_) ((_c_) == ':')/
/^#undef IS_ANY_SEP *$/s/^.*$/#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_)
|| IS_DEVICE_SEP (_c_))/
-/^#undef INTERNAL_TERMINAL *$/s/^.*$/#define INTERNAL_TERMINAL "pc|bios|IBM PC
with color
display::co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>::se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>::AB=<BG
%d>:AF=<FG %d>:op=<DefC>:"/
+/^#undef INTERNAL_TERMINAL *$/s,^.*$,#define INTERNAL_TERMINAL "pc|bios|IBM PC
with color
display::co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>::se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>::AB=<BG
%d>:AF=<FG %d>:op=<DefC>:",
/^#undef NULL_DEVICE *$/s/^.*$/#define NULL_DEVICE "nul"/
-/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR ';'/
+/^#undef SEPCHAR *$/s/^.*$/#define SEPCHAR '\;'/
/^#undef USER_FULL_NAME *$/s/^.*$/#define USER_FULL_NAME (getenv ("NAME"))/
/^#undef _setjmp/s/^.*$/#define _setjmp setjmp/
/^#undef _longjmp/s/^.*$/#define _longjmp longjmp/
=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp 2012-07-28 23:05:32 +0000
+++ b/msdos/sedlibmk.inp 2012-08-04 08:58:33 +0000
@@ -605,10 +605,10 @@
s| *sys/select\.h||
s| *sys/time\.h||
}
-/^am_libgnu_a_OBJECTS *=/,/^[ ]/{
+/^am_libgnu_a_OBJECTS *=/,/^[^ ]/{
+ s/allocator\.\$(OBJEXT) //
s/careadlinkat\.\$(OBJEXT) //
}
-/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)//
/^srcdir *=/s/@address@hidden@/./
/^top_srcdir *=/s/@address@hidden@/../
/^top_builddir *=/s/@address@hidden@/../
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-04 00:52:10 +0000
+++ b/src/ChangeLog 2012-08-04 08:58:33 +0000
@@ -1,3 +1,9 @@
+2012-08-04 Eli Zaretskii <address@hidden>
+
+ * msdos.c (dos_set_window_size, IT_update_begin)
+ (IT_frame_up_to_date, IT_set_frame_parameters): Use FVAR and WVAR
+ instead of direct references.
+
2012-08-04 Paul Eggert <address@hidden>
Export DEFAULT_REHASH_* to GDB.
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2012-07-11 07:19:44 +0000
+++ b/src/msdos.c 2012-08-04 08:58:33 +0000
@@ -594,7 +594,7 @@
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object window = hlinfo->mouse_face_window;
- if (! NILP (window) && XFRAME (XWINDOW (window)->frame) == f)
+ if (! NILP (window) && XFRAME (WVAR (XWINDOW (window), frame)) == f)
{
hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
@@ -1255,7 +1255,7 @@
/* If the mouse highlight is in the window that was deleted
(e.g., if it was popped by completion), clear highlight
unconditionally. */
- if (NILP (w->buffer))
+ if (NILP (WVAR (w, buffer)))
hlinfo->mouse_face_window = Qnil;
else
{
@@ -1265,7 +1265,7 @@
break;
}
- if (NILP (w->buffer) || i < w->desired_matrix->nrows)
+ if (NILP (WVAR (w, buffer)) || i < w->desired_matrix->nrows)
clear_mouse_face (hlinfo);
}
}
@@ -1318,8 +1318,8 @@
frame parameters. For the selected window, we use either its
buffer-local value or the value from the frame parameters if the
buffer doesn't define its local value for the cursor type. */
- sw = XWINDOW (f->selected_window);
- frame_desired_cursor = Fcdr (Fassq (Qcursor_type, f->param_alist));
+ sw = XWINDOW (FVAR (f, selected_window));
+ frame_desired_cursor = Fcdr (Fassq (Qcursor_type, FVAR (f, param_alist)));
if (cursor_in_echo_area
&& FRAME_HAS_MINIBUF_P (f)
&& EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)
@@ -1327,7 +1327,7 @@
new_cursor = frame_desired_cursor;
else
{
- struct buffer *b = XBUFFER (sw->buffer);
+ struct buffer *b = XBUFFER (WVAR (sw, buffer));
if (EQ (BVAR (b,cursor_type), Qt))
new_cursor = frame_desired_cursor;
@@ -1598,7 +1598,7 @@
Lisp_Object *values
= (Lisp_Object *) alloca (length * sizeof (Lisp_Object));
/* Do we have to reverse the foreground and background colors? */
- int reverse = EQ (Fcdr (Fassq (Qreverse, f->param_alist)), Qt);
+ int reverse = EQ (Fcdr (Fassq (Qreverse, FVAR (f, param_alist))), Qt);
int redraw = 0, fg_set = 0, bg_set = 0;
unsigned long orig_fg, orig_bg;
struct tty_display_info *tty = FRAME_TTY (f);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109427: Fix the MSDOS build as fallout of latest changes.,
Eli Zaretskii <=