Mercurial > emacs
changeset 58012:934f6fb6fd8a
* 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.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 07 Nov 2004 09:13:26 +0000 |
| parents | 79614f2016d5 |
| children | 93fda23ae576 |
| files | src/ChangeLog src/dired.c src/dosfns.c src/fileio.c src/msdos.c |
| diffstat | 5 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 07 05:57:58 2004 +0000 +++ b/src/ChangeLog Sun Nov 07 09:13:26 2004 +0000 @@ -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.
--- a/src/dired.c Sun Nov 07 05:57:58 2004 +0000 +++ b/src/dired.c Sun Nov 07 09:13:26 2004 +0000 @@ -116,6 +116,10 @@ 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;
--- a/src/dosfns.c Sun Nov 07 05:57:58 2004 +0000 +++ b/src/dosfns.c Sun Nov 07 09:13:26 2004 +0000 @@ -110,7 +110,7 @@ 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 @@ 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 @@ 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)))
--- a/src/fileio.c Sun Nov 07 05:57:58 2004 +0000 +++ b/src/fileio.c Sun Nov 07 09:13:26 2004 +0000 @@ -89,6 +89,7 @@ #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>
--- a/src/msdos.c Sun Nov 07 05:57:58 2004 +0000 +++ b/src/msdos.c Sun Nov 07 09:13:26 2004 +0000 @@ -2320,7 +2320,7 @@ /* 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];