diff options
| author | Adrian Robert | 2008-07-22 12:33:13 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-07-22 12:33:13 +0000 |
| commit | df2142db9fc6f38c74366c17e02454e15975652a (patch) | |
| tree | a9b5b2e50cbd75bdb14168c7d141ae2db1c01581 /src/nsmenu.m | |
| parent | 365bac35a5ff56d76207a5130c7746b085172cee (diff) | |
| download | emacs-df2142db9fc6f38c74366c17e02454e15975652a.tar.gz emacs-df2142db9fc6f38c74366c17e02454e15975652a.zip | |
NS cleanup: change 'PENDING' to 'FIXME'/'TODO'/'XXX'
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 7fbc1b10c0a..d8dad3e28f8 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -78,7 +78,7 @@ EmacsMenu *mainMenu, *svcsMenu; | |||
| 78 | ========================================================================== */ | 78 | ========================================================================== */ |
| 79 | 79 | ||
| 80 | 80 | ||
| 81 | /*23: PENDING: not currently used, but should normalize with other terms. */ | 81 | /*23: FIXME: not currently used, but should normalize with other terms. */ |
| 82 | void | 82 | void |
| 83 | x_activate_menubar (struct frame *f) | 83 | x_activate_menubar (struct frame *f) |
| 84 | { | 84 | { |
| @@ -197,9 +197,9 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 197 | } | 197 | } |
| 198 | set_buffer_internal_1 (XBUFFER (buffer)); | 198 | set_buffer_internal_1 (XBUFFER (buffer)); |
| 199 | 199 | ||
| 200 | /* PENDING: for some reason this is not needed in other terms, | 200 | /* TODO: for some reason this is not needed in other terms, |
| 201 | but some menu updates call Info-extract-pointer which causes | 201 | but some menu updates call Info-extract-pointer which causes |
| 202 | abort-on-error if waiting-for-input. Needs further investigation. */ | 202 | abort-on-error if waiting-for-input. Needs further investigation. */ |
| 203 | owfi = waiting_for_input; | 203 | owfi = waiting_for_input; |
| 204 | waiting_for_input = 0; | 204 | waiting_for_input = 0; |
| 205 | 205 | ||
| @@ -239,10 +239,10 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 239 | if (NILP (string)) | 239 | if (NILP (string)) |
| 240 | break; | 240 | break; |
| 241 | 241 | ||
| 242 | /* PENDING: we'd like to only parse the needed submenu, but this | 242 | /* FIXME: we'd like to only parse the needed submenu, but this |
| 243 | was causing crashes in the _common parsing code.. need to make | 243 | was causing crashes in the _common parsing code.. need to make |
| 244 | sure proper initialization done.. */ | 244 | sure proper initialization done.. */ |
| 245 | /* if (submenu && strcmp (submenuTitle, SDATA (string))) | 245 | /* if (submenu && strcmp (submenuTitle, SDATA (string))) |
| 246 | continue; */ | 246 | continue; */ |
| 247 | 247 | ||
| 248 | submenu_start[i] = menu_items_used; | 248 | submenu_start[i] = menu_items_used; |
| @@ -298,16 +298,16 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 298 | set_buffer_internal_1 (prev); | 298 | set_buffer_internal_1 (prev); |
| 299 | 299 | ||
| 300 | /* Compare the new menu items with previous, and leave off if no change */ | 300 | /* Compare the new menu items with previous, and leave off if no change */ |
| 301 | /* PENDING: following other terms here, but seems like this should be | 301 | /* FIXME: following other terms here, but seems like this should be |
| 302 | done before parse stage 2 above, since its results aren't used */ | 302 | done before parse stage 2 above, since its results aren't used */ |
| 303 | if (previous_menu_items_used | 303 | if (previous_menu_items_used |
| 304 | && (!submenu || (submenu && submenu == last_submenu)) | 304 | && (!submenu || (submenu && submenu == last_submenu)) |
| 305 | && menu_items_used == previous_menu_items_used) | 305 | && menu_items_used == previous_menu_items_used) |
| 306 | { | 306 | { |
| 307 | for (i = 0; i < previous_menu_items_used; i++) | 307 | for (i = 0; i < previous_menu_items_used; i++) |
| 308 | /* PENDING: this ALWAYS fails on Buffers menu items.. something | 308 | /* FIXME: this ALWAYS fails on Buffers menu items.. something |
| 309 | about their strings causes them to change every time, so we | 309 | about their strings causes them to change every time, so we |
| 310 | double-check failures */ | 310 | double-check failures */ |
| 311 | if (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])) | 311 | if (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])) |
| 312 | if (!(STRINGP (previous_items[i]) | 312 | if (!(STRINGP (previous_items[i]) |
| 313 | && STRINGP (XVECTOR (menu_items)->contents[i]) | 313 | && STRINGP (XVECTOR (menu_items)->contents[i]) |
| @@ -333,7 +333,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 333 | } | 333 | } |
| 334 | } | 334 | } |
| 335 | /* The menu items are different, so store them in the frame */ | 335 | /* The menu items are different, so store them in the frame */ |
| 336 | /* PENDING: this is not correct for single-submenu case */ | 336 | /* FIXME: this is not correct for single-submenu case */ |
| 337 | f->menu_bar_vector = menu_items; | 337 | f->menu_bar_vector = menu_items; |
| 338 | f->menu_bar_items_used = menu_items_used; | 338 | f->menu_bar_items_used = menu_items_used; |
| 339 | 339 | ||
| @@ -830,7 +830,7 @@ ns_popup_menu (Lisp_Object position, Lisp_Object menu) | |||
| 830 | } | 830 | } |
| 831 | else | 831 | else |
| 832 | { /* no position given */ | 832 | { /* no position given */ |
| 833 | /* PENDING: if called during dump, we need to stop precomputation of | 833 | /* FIXME: if called during dump, we need to stop precomputation of |
| 834 | key equivalents (see below) because the keydefs in ns-win.el have | 834 | key equivalents (see below) because the keydefs in ns-win.el have |
| 835 | not been loaded yet. */ | 835 | not been loaded yet. */ |
| 836 | if (noninteractive) | 836 | if (noninteractive) |
| @@ -934,7 +934,7 @@ ns_popup_menu (Lisp_Object position, Lisp_Object menu) | |||
| 934 | specpdl_count2 = SPECPDL_INDEX (); | 934 | specpdl_count2 = SPECPDL_INDEX (); |
| 935 | 935 | ||
| 936 | #if 0 | 936 | #if 0 |
| 937 | /*PENDING: a couple of one-line differences prevent reuse */ | 937 | /* FIXME: a couple of one-line differences prevent reuse */ |
| 938 | wv = digest_single_submenu (0, menu_items_used, Qnil); | 938 | wv = digest_single_submenu (0, menu_items_used, Qnil); |
| 939 | #else | 939 | #else |
| 940 | { | 940 | { |