[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Thu, 07 Feb 2008 04:11:07 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/02/07 04:11:06
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1182
retrieving revision 1.1183
diff -u -b -r1.1182 -r1.1183
--- xdisp.c 6 Feb 2008 11:54:51 -0000 1.1182
+++ xdisp.c 7 Feb 2008 04:11:04 -0000 1.1183
@@ -8214,7 +8214,7 @@
struct window *w;
{
int i = 0;
- Lisp_Object vector;
+ Lisp_Object vector, tmp;
/* Reduce consing by keeping one vector in
Vwith_echo_area_save_vector. */
@@ -8224,22 +8224,22 @@
if (NILP (vector))
vector = Fmake_vector (make_number (7), Qnil);
- XSETBUFFER (AREF (vector, i), current_buffer); ++i;
- AREF (vector, i) = Vdeactivate_mark, ++i;
- AREF (vector, i) = make_number (windows_or_buffers_changed), ++i;
+ XSETBUFFER (tmp, current_buffer); ASET (vector, i, tmp); ++i;
+ ASET (vector, i, Vdeactivate_mark); ++i;
+ ASET (vector, i, make_number (windows_or_buffers_changed)); ++i;
if (w)
{
- XSETWINDOW (AREF (vector, i), w); ++i;
- AREF (vector, i) = w->buffer; ++i;
- AREF (vector, i) = make_number (XMARKER (w->pointm)->charpos); ++i;
- AREF (vector, i) = make_number (XMARKER (w->pointm)->bytepos); ++i;
+ XSETWINDOW (tmp, w); ASET (vector, i, tmp); ++i;
+ ASET (vector, i, w->buffer); ++i;
+ ASET (vector, i, make_number (XMARKER (w->pointm)->charpos)); ++i;
+ ASET (vector, i, make_number (XMARKER (w->pointm)->bytepos)); ++i;
}
else
{
int end = i + 4;
for (; i < end; ++i)
- AREF (vector, i) = Qnil;
+ ASET (vector, i, Qnil);
}
xassert (i == ASIZE (vector));
@@ -9090,7 +9090,7 @@
format_mode_line_unwind_data (obuf, save_proptrans)
struct buffer *obuf;
{
- Lisp_Object vector;
+ Lisp_Object vector, tmp;
/* Reduce consing by keeping one vector in
Vwith_echo_area_save_vector. */
@@ -9100,17 +9100,18 @@
if (NILP (vector))
vector = Fmake_vector (make_number (7), Qnil);
- AREF (vector, 0) = make_number (mode_line_target);
- AREF (vector, 1) = make_number (MODE_LINE_NOPROP_LEN (0));
- AREF (vector, 2) = mode_line_string_list;
- AREF (vector, 3) = (save_proptrans ? mode_line_proptrans_alist : Qt);
- AREF (vector, 4) = mode_line_string_face;
- AREF (vector, 5) = mode_line_string_face_prop;
+ ASET (vector, 0, make_number (mode_line_target));
+ ASET (vector, 1, make_number (MODE_LINE_NOPROP_LEN (0)));
+ ASET (vector, 2, mode_line_string_list);
+ ASET (vector, 3, save_proptrans ? mode_line_proptrans_alist : Qt);
+ ASET (vector, 4, mode_line_string_face);
+ ASET (vector, 5, mode_line_string_face_prop);
if (obuf)
- XSETBUFFER (AREF (vector, 6), obuf);
+ XSETBUFFER (tmp, obuf);
else
- AREF (vector, 6) = Qnil;
+ tmp = Qnil;
+ ASET (vector, 6, tmp);
return vector;
}
@@ -9130,7 +9131,7 @@
if (!NILP (AREF (vector, 6)))
{
set_buffer_internal_1 (XBUFFER (AREF (vector, 6)));
- AREF (vector, 6) = Qnil;
+ ASET (vector, 6, Qnil);
}
Vmode_line_unwind_vector = vector;
@@ -16775,7 +16776,7 @@
break;
/* Remember where item was displayed. */
- AREF (items, i + 3) = make_number (it.hpos);
+ ASET (items, i + 3, make_number (it.hpos));
/* Display the item, pad with one space. */
if (it.current_x < it.last_visible_x)
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Miles Bader, 2008/02/01
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Juanma Barranquero, 2008/02/17
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/02/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/02/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kenichi Handa, 2008/02/25
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2008/02/26
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kim F. Storm, 2008/02/27