From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 7 Nov 2004 09:13:26 +0000 (+0000)
Subject: * dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
X-Git-Tag: ttn-vms-21-2-B4~4126
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=238a44a8657ff8cf0feee84619262255b354c55d;p=emacs.git

* dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
comparisons with integers instead of Lisp_Object address.
(Fmsdos_set_keyboard): Declare argument allkeys.

* msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.

* dired.c: extern declare Fmsdos_downcase_filename on MSDOS to avoid
int/Lisp_Object mixup.

* fileio.c: Ditto.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e3870669c0..e73fbe12775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* dosfns.c (Fdos_memget, Fdos_memput): Use integer variable offs in
+	comparisons with integers instead of Lisp_Object address.
+	(Fmsdos_set_keyboard): Declare argument allkeys.
+
+	* msdos.c (IT_set_frame_parameters): Use EQ, not ==, for Lisp_Object:s.
+
+	* dired.c: extern declare Fmsdos_downcase_filename on MSDOS to avoid
+	int/Lisp_Object mixup.
+
+	* fileio.c: Ditto.
+
 2004-11-06  Steven Tamm  <steventamm@mac.com>
 
 	* editfns.c: Need to include sys/time.h before resource.h on darwin.
diff --git a/src/dired.c b/src/dired.c
index e833ceb216b..97df606bb29 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -116,6 +116,10 @@ extern int completion_ignore_case;
 extern Lisp_Object Vcompletion_regexp_list;
 extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
 
+#ifdef MSDOS
+extern Lisp_Object Fmsdos_downcase_filename P_ ((Lisp_Object));
+#endif
+
 Lisp_Object Vcompletion_ignored_extensions;
 Lisp_Object Qcompletion_ignore_case;
 Lisp_Object Qdirectory_files;
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)))
diff --git a/src/fileio.c b/src/fileio.c
index aa37c296eb3..1fd0030a4f7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -89,6 +89,7 @@ extern int errno;
 #ifdef MSDOS
 #include "msdos.h"
 #include <sys/param.h>
+extern Lisp_Object Fmsdos_downcase_filename P_ ((Lisp_Object));
 #if __DJGPP__ >= 2
 #include <fcntl.h>
 #include <string.h>
diff --git a/src/msdos.c b/src/msdos.c
index e0f4527e5ae..d75ea18ea97 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -2320,7 +2320,7 @@ IT_set_frame_parameters (f, alist)
 
   /* If we are creating a new frame, begin with the original screen colors
      used for the initial frame.  */
-  if (alist == Vdefault_frame_alist
+  if (EQ (alist, Vdefault_frame_alist)
       && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1)
     {
       FRAME_FOREGROUND_PIXEL (f) = initial_screen_colors[0];