aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-08-07 09:29:25 +0400
committerDmitry Antipov2012-08-07 09:29:25 +0400
commite69b09607980b55ee15d60424072feac4b6e72a6 (patch)
treea589f89bbd6c3f413383bd3b39b2ed505c773b0c /src/buffer.c
parent5fb50dd30236d8e64951c2f7e72a2d2e15257f24 (diff)
downloademacs-e69b09607980b55ee15d60424072feac4b6e72a6.tar.gz
emacs-e69b09607980b55ee15d60424072feac4b6e72a6.zip
Drop FGET and revert read access to Lisp_Objects slots of struct frame.
* frame.h (FGET): Remove. (struct frame): Do not use INTERNAL_FIELD. * buffer.c, data.c, dispnew.c, dosfns.c, eval.c, fontset.c, frame.c: * fringe.c, gtkutil.c, minibuf.c, msdos.c, nsfns.m, nsmenu.m, nsterm.m: * print.c, term.c, w32fns.c, w32menu.c, w32term.c, window.c, window.h: * xdisp.c, xfaces.c, xfns.c, xmenu.c, xterm.c: Adjust users.
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 6085746ee6e..38399609718 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -193,9 +193,9 @@ followed by the rest of the buffers. */)
193 Lisp_Object args[3]; 193 Lisp_Object args[3];
194 194
195 CHECK_FRAME (frame); 195 CHECK_FRAME (frame);
196 framelist = Fcopy_sequence (FGET (XFRAME (frame), buffer_list)); 196 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
197 prevlist = Fnreverse (Fcopy_sequence 197 prevlist = Fnreverse (Fcopy_sequence
198 (FGET (XFRAME (frame), buried_buffer_list))); 198 (XFRAME (frame)->buried_buffer_list));
199 199
200 /* Remove from GENERAL any buffer that duplicates one in 200 /* Remove from GENERAL any buffer that duplicates one in
201 FRAMELIST or PREVLIST. */ 201 FRAMELIST or PREVLIST. */
@@ -1327,7 +1327,7 @@ exists, return the buffer `*scratch*' (creating it if necessary). */)
1327 1327
1328 pred = frame_buffer_predicate (frame); 1328 pred = frame_buffer_predicate (frame);
1329 /* Consider buffers that have been seen in the frame first. */ 1329 /* Consider buffers that have been seen in the frame first. */
1330 tail = FGET (XFRAME (frame), buffer_list); 1330 tail = XFRAME (frame)->buffer_list;
1331 for (; CONSP (tail); tail = XCDR (tail)) 1331 for (; CONSP (tail); tail = XCDR (tail))
1332 { 1332 {
1333 buf = XCAR (tail); 1333 buf = XCAR (tail);
@@ -1767,8 +1767,8 @@ record_buffer (Lisp_Object buffer)
1767 Vinhibit_quit = tem; 1767 Vinhibit_quit = tem;
1768 1768
1769 /* Update buffer list of selected frame. */ 1769 /* Update buffer list of selected frame. */
1770 FSET (f, buffer_list, Fcons (buffer, Fdelq (buffer, FGET (f, buffer_list)))); 1770 FSET (f, buffer_list, Fcons (buffer, Fdelq (buffer, f->buffer_list)));
1771 FSET (f, buried_buffer_list, Fdelq (buffer, FGET (f, buried_buffer_list))); 1771 FSET (f, buried_buffer_list, Fdelq (buffer, f->buried_buffer_list));
1772 1772
1773 /* Run buffer-list-update-hook. */ 1773 /* Run buffer-list-update-hook. */
1774 if (!NILP (Vrun_hooks)) 1774 if (!NILP (Vrun_hooks))
@@ -1805,9 +1805,9 @@ DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
1805 Vinhibit_quit = tem; 1805 Vinhibit_quit = tem;
1806 1806
1807 /* Update buffer lists of selected frame. */ 1807 /* Update buffer lists of selected frame. */
1808 FSET (f, buffer_list, Fdelq (buffer, FGET (f, buffer_list))); 1808 FSET (f, buffer_list, Fdelq (buffer, f->buffer_list));
1809 FSET (f, buried_buffer_list, 1809 FSET (f, buried_buffer_list,
1810 Fcons (buffer, Fdelq (buffer, FGET (f, buried_buffer_list)))); 1810 Fcons (buffer, Fdelq (buffer, f->buried_buffer_list)));
1811 1811
1812 /* Run buffer-list-update-hook. */ 1812 /* Run buffer-list-update-hook. */
1813 if (!NILP (Vrun_hooks)) 1813 if (!NILP (Vrun_hooks))