Changeset 9eb38bb for functions.c
- Timestamp:
- Sep 18, 2010, 5:07:39 PM (14 years ago)
- Branches:
- master, release-1.10, release-1.7, release-1.8, release-1.9
- Children:
- d574d61
- Parents:
- 8ee712e0
- git-author:
- David Benjamin <davidben@mit.edu> (08/01/10 14:09:34)
- git-committer:
- David Benjamin <davidben@mit.edu> (09/18/10 17:07:39)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
r03ca005 r9eb38bb 1237 1237 owl_viewwin *v; 1238 1238 1239 v=owl_global_get_viewwin(&g); 1240 1241 if (owl_global_get_popwin(&g)) { 1239 if (owl_global_get_popwin(&g) || owl_global_get_viewwin(&g)) { 1242 1240 owl_function_error("Popwin already in use."); 1243 1241 return; … … 1246 1244 owl_global_set_popwin(&g, pw); 1247 1245 owl_popwin_up(pw); 1246 1247 v = owl_viewwin_new_text(owl_popwin_get_content(pw), text); 1248 owl_global_set_viewwin(&g, v); 1249 1248 1250 owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL); 1249 owl_viewwin_init_text(v, owl_popwin_get_content(pw), text);1250 1251 } 1251 1252 … … 1255 1256 owl_viewwin *v; 1256 1257 1257 v=owl_global_get_viewwin(&g); 1258 1259 if (owl_global_get_popwin(&g)) { 1258 if (owl_global_get_popwin(&g) || owl_global_get_viewwin(&g)) { 1260 1259 owl_function_error("Popwin already in use."); 1261 1260 return; … … 1264 1263 owl_global_set_popwin(&g, pw); 1265 1264 owl_popwin_up(pw); 1265 1266 v = owl_viewwin_new_fmtext(owl_popwin_get_content(pw), fm); 1267 owl_global_set_viewwin(&g, v); 1268 1266 1269 owl_global_push_context(&g, OWL_CTX_POPLESS, v, "popless", NULL); 1267 owl_viewwin_init_fmtext(v, owl_popwin_get_content(pw), fm);1268 1270 } 1269 1271
Note: See TracChangeset
for help on using the changeset viewer.