aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/marker.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 12b14625a91..0b274598986 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-10-11 Paul Eggert <eggert@cs.ucla.edu> 12012-10-11 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * marker.c (cached_modiff): EMACS_INT, not int.
4
3 * w32select.c (waiting_for_input): Declare by including "keyboard.h" 5 * w32select.c (waiting_for_input): Declare by including "keyboard.h"
4 instead of having a wrong decl. 6 instead of having a wrong decl.
5 * nsmenu.m (waiting_for_input): Remove wrong decl. 7 * nsmenu.m (waiting_for_input): Remove wrong decl.
diff --git a/src/marker.c b/src/marker.c
index e01647bdb2a..2e2aba579db 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -29,7 +29,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
29static ptrdiff_t cached_charpos; 29static ptrdiff_t cached_charpos;
30static ptrdiff_t cached_bytepos; 30static ptrdiff_t cached_bytepos;
31static struct buffer *cached_buffer; 31static struct buffer *cached_buffer;
32static int cached_modiff; 32static EMACS_INT cached_modiff;
33 33
34/* Juanma Barranquero <lekktu@gmail.com> reported ~3x increased 34/* Juanma Barranquero <lekktu@gmail.com> reported ~3x increased
35 bootstrap time when byte_char_debug_check is enabled; so this 35 bootstrap time when byte_char_debug_check is enabled; so this