Mercurial > vim
comparison src/if_mzsch.c @ 9649:fd9727ae3c49 v7.4.2101
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 24 22:04:11 2016 +0200
patch 7.4.2101
Problem: Looping over windows, buffers and tab pages is inconsistant.
Solution: Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 24 Jul 2016 22:15:07 +0200 |
parents | 29de7dda7a6a |
children | 80ac9cf77c9b |
comparison
equal
deleted
inserted
replaced
9648:227649fd4301 | 9649:fd9727ae3c49 |
---|---|
1914 { | 1914 { |
1915 int n = 0; | 1915 int n = 0; |
1916 #ifdef FEAT_WINDOWS | 1916 #ifdef FEAT_WINDOWS |
1917 win_T *w; | 1917 win_T *w; |
1918 | 1918 |
1919 for (w = firstwin; w != NULL; w = w->w_next) | 1919 FOR_ALL_WINDOWS(w) |
1920 #endif | 1920 #endif |
1921 ++n; | 1921 ++n; |
1922 return scheme_make_integer(n); | 1922 return scheme_make_integer(n); |
1923 } | 1923 } |
1924 | 1924 |
2195 buf_T *buf; | 2195 buf_T *buf; |
2196 int fnum; | 2196 int fnum; |
2197 | 2197 |
2198 fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0)); | 2198 fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0)); |
2199 | 2199 |
2200 for (buf = firstbuf; buf; buf = buf->b_next) | 2200 FOR_ALL_BUFFERS(buf) |
2201 if (buf->b_fnum == fnum) | 2201 if (buf->b_fnum == fnum) |
2202 return buffer_new(buf); | 2202 return buffer_new(buf); |
2203 | 2203 |
2204 return scheme_false; | 2204 return scheme_false; |
2205 } | 2205 } |
2218 MZ_GC_VAR_IN_REG(1, fname); | 2218 MZ_GC_VAR_IN_REG(1, fname); |
2219 MZ_GC_REG(); | 2219 MZ_GC_REG(); |
2220 fname = GUARANTEED_STRING_ARG(prim->name, 0); | 2220 fname = GUARANTEED_STRING_ARG(prim->name, 0); |
2221 buffer = scheme_false; | 2221 buffer = scheme_false; |
2222 | 2222 |
2223 for (buf = firstbuf; buf; buf = buf->b_next) | 2223 FOR_ALL_BUFFERS(buf) |
2224 { | 2224 { |
2225 if (buf->b_ffname == NULL || buf->b_sfname == NULL) | 2225 if (buf->b_ffname == NULL || buf->b_sfname == NULL) |
2226 /* empty string */ | 2226 /* empty string */ |
2227 { | 2227 { |
2228 if (BYTE_STRING_VALUE(fname)[0] == NUL) | 2228 if (BYTE_STRING_VALUE(fname)[0] == NUL) |
2281 get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) | 2281 get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED) |
2282 { | 2282 { |
2283 buf_T *b; | 2283 buf_T *b; |
2284 int n = 0; | 2284 int n = 0; |
2285 | 2285 |
2286 for (b = firstbuf; b; b = b->b_next) ++n; | 2286 FOR_ALL_BUFFERS(b) ++n; |
2287 return scheme_make_integer(n); | 2287 return scheme_make_integer(n); |
2288 } | 2288 } |
2289 | 2289 |
2290 /* (get-buff-name [buffer]) */ | 2290 /* (get-buff-name [buffer]) */ |
2291 static Scheme_Object * | 2291 static Scheme_Object * |