aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-27 11:18:31 -0700
committerPaul Eggert2011-03-27 11:18:31 -0700
commit32ad8845a456fef4118a657b79129e837b4ec778 (patch)
treea9031696e8aa9ca972c14038b97017a55ec893bd /src
parentba0165e1f14c55aaba73de35d75a9acea721c825 (diff)
downloademacs-32ad8845a456fef4118a657b79129e837b4ec778.tar.gz
emacs-32ad8845a456fef4118a657b79129e837b4ec778.zip
* keyboard.c (keyremap_step, read_key_sequence): Use size_t for sizes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/keyboard.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bfee23b16d0..8b32aa78a6d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * keyboard.c (parse_modifiers_uncached, parse_modifiers): 3 * keyboard.c (parse_modifiers_uncached, parse_modifiers):
4 Don't assume string length fits in int. 4 Don't assume string length fits in int.
5 (keyremap_step, read_key_sequence): Use size_t for sizes.
5 6
6 * callproc.c (Fcall_process, Fcall_process_region): Use SAFE_ALLOCA 7 * callproc.c (Fcall_process, Fcall_process_region): Use SAFE_ALLOCA
7 instead of alloca (Bug#8344). 8 instead of alloca (Bug#8344).
diff --git a/src/keyboard.c b/src/keyboard.c
index e29c7e9bc5c..0fde344478e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1270,7 +1270,7 @@ some_mouse_moved (void)
1270/* This is the actual command reading loop, 1270/* This is the actual command reading loop,
1271 sans error-handling encapsulation. */ 1271 sans error-handling encapsulation. */
1272 1272
1273static int read_key_sequence (Lisp_Object *, int, Lisp_Object, 1273static int read_key_sequence (Lisp_Object *, size_t, Lisp_Object,
1274 int, int, int); 1274 int, int, int);
1275void safe_run_hooks (Lisp_Object); 1275void safe_run_hooks (Lisp_Object);
1276static void adjust_point_for_property (EMACS_INT, int); 1276static void adjust_point_for_property (EMACS_INT, int);
@@ -8748,7 +8748,7 @@ access_keymap_keyremap (Lisp_Object map, Lisp_Object key, Lisp_Object prompt,
8748 The return value is non-zero if the remapping actually took place. */ 8748 The return value is non-zero if the remapping actually took place. */
8749 8749
8750static int 8750static int
8751keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey, 8751keyremap_step (Lisp_Object *keybuf, size_t bufsize, volatile keyremap *fkey,
8752 int input, int doit, int *diff, Lisp_Object prompt) 8752 int input, int doit, int *diff, Lisp_Object prompt)
8753{ 8753{
8754 Lisp_Object next, key; 8754 Lisp_Object next, key;
@@ -8841,7 +8841,7 @@ keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey,
8841 from the selected window's buffer. */ 8841 from the selected window's buffer. */
8842 8842
8843static int 8843static int
8844read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, 8844read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt,
8845 int dont_downcase_last, int can_return_switch_frame, 8845 int dont_downcase_last, int can_return_switch_frame,
8846 int fix_current_buffer) 8846 int fix_current_buffer)
8847{ 8847{