Merged in changes from CVS trunk.

Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
author: Karoly Lorentey 2004-11-13 18:34:40 +0000
committer: Karoly Lorentey 2004-11-13 18:34:40 +0000
commit: e417405015c93c81641f5c4a33ec898b5c353772 (patch)
tree: 017a980c35c8a71c372304418d151e3826f88636 /src/dosfns.c
parent: f590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff)
parent: 68d1b30d251b4771f739d20f507cd9523ae3919b (diff)
download: emacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz
emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dosfns.c b/src/dosfns.c
index d9714693507..bd62147ad48 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -110,7 +110,7 @@ Return the updated VECTOR.  */)
  offs = (unsigned long) XINT (address);
  CHECK_VECTOR (vector);
  len = XVECTOR (vector)-> size;
-  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len)
+  if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
    return Qnil;
  buf = alloca (len);
  dosmemget (offs, len, buf);
@@ -135,7 +135,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
  offs = (unsigned long) XINT (address);
  CHECK_VECTOR (vector);
  len = XVECTOR (vector)-> size;
-  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len)
+  if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
    return Qnil;
  buf = alloca (len);
@@ -155,7 +155,7 @@ If the optional argument ALLKEYS is non-nil, the keyboard is mapped for
 all keys; otherwise it is only used when the ALT key is pressed.
 The current keyboard layout is available in dos-keyboard-code.  */)
     (country_code, allkeys)
-     Lisp_Object country_code;
+     Lisp_Object country_code, allkeys;
 {
  CHECK_NUMBER (country_code);
  if (!dos_set_keyboard (XINT (country_code), !NILP (allkeys)))
author	Karoly Lorentey	2004-11-13 18:34:40 +0000
committer	Karoly Lorentey	2004-11-13 18:34:40 +0000
commit	e417405015c93c81641f5c4a33ec898b5c353772 (patch)
tree	017a980c35c8a71c372304418d151e3826f88636 /src/dosfns.c
parent	f590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff)
parent	68d1b30d251b4771f739d20f507cd9523ae3919b (diff)
download	emacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip

diff --git a/src/dosfns.c b/src/dosfns.c index d9714693507..bd62147ad48 100644 --- a/src/dosfns.c +++ b/src/dosfns.c
@@ -110,7 +110,7 @@ Return the updated VECTOR. */)
110	offs = (unsigned long) XINT (address);	110	offs = (unsigned long) XINT (address);
111	CHECK_VECTOR (vector);	111	CHECK_VECTOR (vector);
112	len = XVECTOR (vector)-> size;	112	len = XVECTOR (vector)-> size;
113	if (len < 1 \|\| len > 2048 \|\| address < 0 \|\| address > 0xfffff - len)	113	if (len < 1 \|\| len > 2048 \|\| offs < 0 \|\| offs > 0xfffff - len)
114	return Qnil;	114	return Qnil;
115	buf = alloca (len);	115	buf = alloca (len);
116	dosmemget (offs, len, buf);	116	dosmemget (offs, len, buf);
@@ -135,7 +135,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
135	offs = (unsigned long) XINT (address);	135	offs = (unsigned long) XINT (address);
136	CHECK_VECTOR (vector);	136	CHECK_VECTOR (vector);
137	len = XVECTOR (vector)-> size;	137	len = XVECTOR (vector)-> size;
138	if (len < 1 \|\| len > 2048 \|\| address < 0 \|\| address > 0xfffff - len)	138	if (len < 1 \|\| len > 2048 \|\| offs < 0 \|\| offs > 0xfffff - len)
139	return Qnil;	139	return Qnil;
140	buf = alloca (len);	140	buf = alloca (len);
141		141
@@ -155,7 +155,7 @@ If the optional argument ALLKEYS is non-nil, the keyboard is mapped for
155	all keys; otherwise it is only used when the ALT key is pressed.	155	all keys; otherwise it is only used when the ALT key is pressed.
156	The current keyboard layout is available in dos-keyboard-code. */)	156	The current keyboard layout is available in dos-keyboard-code. */)
157	(country_code, allkeys)	157	(country_code, allkeys)
158	Lisp_Object country_code;	158	Lisp_Object country_code, allkeys;
159	{	159	{
160	CHECK_NUMBER (country_code);	160	CHECK_NUMBER (country_code);
161	if (!dos_set_keyboard (XINT (country_code), !NILP (allkeys)))	161	if (!dos_set_keyboard (XINT (country_code), !NILP (allkeys)))