[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100756: Fix MS-DOS build broken by r
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100756: Fix MS-DOS build broken by revno 100745; fix MS-DOS configury. |
Date: |
Thu, 08 Jul 2010 20:53:29 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100756 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-08 20:53:29 +0300
message:
Fix MS-DOS build broken by revno 100745; fix MS-DOS configury.
src/process.c (kbd_is_on_hold, hold_keyboard_input)
(unhold_keyboard_input, kbd_on_hold_p) [!subprocesses]: Define.
msdos/sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target,
which doesn't exist.
msdos/sed2v2.inp (HAVE_MEMCPY): Don't edit, already defined on
<sys/config.h>.
modified:
msdos/ChangeLog
msdos/sed1v2.inp
msdos/sed2v2.inp
src/ChangeLog
src/process.c
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2010-07-08 03:31:04 +0000
+++ b/msdos/ChangeLog 2010-07-08 17:41:04 +0000
@@ -1,3 +1,10 @@
+2010-07-08 Eli Zaretskii <address@hidden>
+
+ * sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target,
+ which doesn't exist.
+
+ * sed2v2.inp (HAVE_MEMCPY): Don't edit, defined on <sys/config.h>.
+
2010-07-08 Dan Nicolaescu <address@hidden>
* sed1v2.inp: Remove reference to prefix-args.
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2010-07-08 03:31:04 +0000
+++ b/msdos/sed1v2.inp 2010-07-08 17:41:04 +0000
@@ -128,7 +128,6 @@
/^[ ]*$/d
/^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit
-/^temacs:/s/stamp-oldxmenu//
/^ if test "\${CANNOT_DUMP}" =/,/^ else /d
/^ fi/d
/^ LC_ALL=C \$(RUN_TEMACS)/i\
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2010-07-07 22:18:28 +0000
+++ b/msdos/sed2v2.inp 2010-07-08 17:41:04 +0000
@@ -38,7 +38,6 @@
/^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/
/^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/
/^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/
-/^#undef HAVE_MEMCPY *$/s/^.*$/#define HAVE_MEMCPY 1/
/^#undef HAVE_MEMSET *$/s/^.*$/#define HAVE_MEMSET 1/
/^#undef HAVE_MEMCMP *$/s/^.*$/#define HAVE_MEMCMP 1/
/^#undef HAVE_MEMMOVE *$/s/^.*$/#define HAVE_MEMMOVE 1/
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-08 10:35:54 +0000
+++ b/src/ChangeLog 2010-07-08 17:30:58 +0000
@@ -1,3 +1,8 @@
+2010-07-08 Eli Zaretskii <address@hidden>
+
+ * process.c (kbd_is_on_hold, hold_keyboard_input)
+ (unhold_keyboard_input, kbd_on_hold_p) [!subprocesses]: Define.
+
2010-07-08 Jan Djärv <address@hidden>
* xmenu.c (set_frame_menubar, create_and_show_popup_menu)
=== modified file 'src/process.c'
--- a/src/process.c 2010-07-07 22:18:28 +0000
+++ b/src/process.c 2010-07-08 17:30:58 +0000
@@ -7600,6 +7600,9 @@
Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtime, Qctime;
+/* Non-zero if keyboard input is on hold, zero otherwise. */
+static int kbd_is_on_hold;
+
/* As described above, except assuming that there are no subprocesses:
Wait for timeout to elapse and/or keyboard input to be available.
@@ -7860,6 +7863,31 @@
{
}
+
+/* Stop reading input from keyboard sources. */
+
+void
+hold_keyboard_input (void)
+{
+ kbd_is_on_hold = 1;
+}
+
+/* Resume reading input from keyboard sources. */
+
+void
+unhold_keyboard_input (void)
+{
+ kbd_is_on_hold = 0;
+}
+
+/* Return non-zero if keyboard input is on hold, zero otherwise. */
+
+int
+kbd_on_hold_p (void)
+{
+ return kbd_is_on_hold;
+}
+
DEFUN ("list-system-processes", Flist_system_processes, Slist_system_processes,
0, 0, 0,
doc: /* Return a list of numerical process IDs of all running processes.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100756: Fix MS-DOS build broken by revno 100745; fix MS-DOS configury.,
Eli Zaretskii <=