aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-01-11 22:15:12 -0800
committerPaul Eggert2013-01-11 22:15:12 -0800
commitbdc9b756cdbfd3dc2b8b2175816d4a81c7021a8d (patch)
treea338d7dbdbd5082e068906080c4d6e05653081a1 /src
parent444b01bb49d94293d6514271b639ffa4928de640 (diff)
downloademacs-bdc9b756cdbfd3dc2b8b2175816d4a81c7021a8d.tar.gz
emacs-bdc9b756cdbfd3dc2b8b2175816d4a81c7021a8d.zip
* indent.c (Fvertical_motion): Remove now-incorrect GCPROs
for old_charpos and old_bytepos.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/indent.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2481177f465..13b53e922ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-01-12 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * indent.c (Fvertical_motion): Remove now-incorrect GCPROs
4 for old_charpos and old_bytepos.
5
12013-01-12 Paul Eggert <eggert@cs.ucla.edu> 62013-01-12 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415). 8 Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415).
diff --git a/src/indent.c b/src/indent.c
index 4a30c00dd27..45b6afbd395 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1970,7 +1970,7 @@ whether or not it is currently displayed in some window. */)
1970 struct window *w; 1970 struct window *w;
1971 Lisp_Object old_buffer; 1971 Lisp_Object old_buffer;
1972 EMACS_INT old_charpos IF_LINT (= 0), old_bytepos IF_LINT (= 0); 1972 EMACS_INT old_charpos IF_LINT (= 0), old_bytepos IF_LINT (= 0);
1973 struct gcpro gcpro1, gcpro2, gcpro3; 1973 struct gcpro gcpro1;
1974 Lisp_Object lcols = Qnil; 1974 Lisp_Object lcols = Qnil;
1975 double cols IF_LINT (= 0); 1975 double cols IF_LINT (= 0);
1976 void *itdata = NULL; 1976 void *itdata = NULL;
@@ -1987,7 +1987,7 @@ whether or not it is currently displayed in some window. */)
1987 w = decode_live_window (window); 1987 w = decode_live_window (window);
1988 1988
1989 old_buffer = Qnil; 1989 old_buffer = Qnil;
1990 GCPRO3 (old_buffer, old_charpos, old_bytepos); 1990 GCPRO1 (old_buffer);
1991 if (XBUFFER (w->buffer) != current_buffer) 1991 if (XBUFFER (w->buffer) != current_buffer)
1992 { 1992 {
1993 /* Set the window's buffer temporarily to the current buffer. */ 1993 /* Set the window's buffer temporarily to the current buffer. */