diff options
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 4d901fac2ec..6352d882b7a 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -112,8 +112,8 @@ clean_local_selection_data (Lisp_Object obj) | |||
| 112 | 112 | ||
| 113 | if (VECTORP (obj)) | 113 | if (VECTORP (obj)) |
| 114 | { | 114 | { |
| 115 | int i; | 115 | ptrdiff_t i; |
| 116 | int size = ASIZE (obj); | 116 | ptrdiff_t size = ASIZE (obj); |
| 117 | Lisp_Object copy; | 117 | Lisp_Object copy; |
| 118 | 118 | ||
| 119 | if (size == 1) | 119 | if (size == 1) |
| @@ -184,7 +184,7 @@ ns_get_local_selection (Lisp_Object selection_name, | |||
| 184 | { | 184 | { |
| 185 | Lisp_Object local_value; | 185 | Lisp_Object local_value; |
| 186 | Lisp_Object handler_fn, value, type, check; | 186 | Lisp_Object handler_fn, value, type, check; |
| 187 | int count; | 187 | ptrdiff_t count; |
| 188 | 188 | ||
| 189 | local_value = assq_no_quit (selection_name, Vselection_alist); | 189 | local_value = assq_no_quit (selection_name, Vselection_alist); |
| 190 | 190 | ||
| @@ -297,7 +297,7 @@ ns_string_from_pasteboard (id pb) | |||
| 297 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; | 297 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; |
| 298 | 298 | ||
| 299 | #if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 | 299 | #if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 |
| 300 | if (!utfStr) | 300 | if (!utfStr) |
| 301 | { | 301 | { |
| 302 | utfStr = [mstr cString]; | 302 | utfStr = [mstr cString]; |
| 303 | length = strlen (utfStr); | 303 | length = strlen (utfStr); |
| @@ -603,4 +603,3 @@ The functions are called with one argument, the selection type\n\ | |||
| 603 | Qforeign_selection = intern_c_string ("foreign-selection"); | 603 | Qforeign_selection = intern_c_string ("foreign-selection"); |
| 604 | staticpro (&Qforeign_selection); | 604 | staticpro (&Qforeign_selection); |
| 605 | } | 605 | } |
| 606 | |||