diff options
| author | Joakim Verona | 2011-06-23 01:28:30 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-06-23 01:28:30 +0200 |
| commit | c5082a753011dacef505e91f1fc30a84fa75a2eb (patch) | |
| tree | 2c995eff276b6e9e68f54b4ebe76bf012231c86d /src/textprop.c | |
| parent | 787c27e81f046cfa1c457ed405551f8ca0ddb0e8 (diff) | |
| parent | 297dde5a97c0c5c8020db72213c7f84067f1ee21 (diff) | |
| download | emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.tar.gz emacs-c5082a753011dacef505e91f1fc30a84fa75a2eb.zip | |
merge upstream
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/textprop.c b/src/textprop.c index 350892cdad6..dd8695f7af8 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -613,7 +613,7 @@ get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop, | |||
| 613 | } | 613 | } |
| 614 | if (BUFFERP (object)) | 614 | if (BUFFERP (object)) |
| 615 | { | 615 | { |
| 616 | int noverlays; | 616 | ptrdiff_t noverlays; |
| 617 | Lisp_Object *overlay_vec; | 617 | Lisp_Object *overlay_vec; |
| 618 | struct buffer *obuf = current_buffer; | 618 | struct buffer *obuf = current_buffer; |
| 619 | 619 | ||