diff options
| author | Tom Tromey | 2018-08-09 17:56:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-09 17:56:53 -0600 |
| commit | accb7b7ecc19f85c2750ded1046a464bc73c6a52 (patch) | |
| tree | 1aa94af022d6700a93a8ff2b73f5b210046ac010 /src/xmenu.c | |
| parent | f822a2516d88eeb2118fbbc8554f155e86dfd74e (diff) | |
| parent | 53483df0de0085dbc9ef0b15a0f629ab808b0147 (diff) | |
| download | emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.tar.gz emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.zip | |
Merge remote-tracking branch 'origin/master' into feature/bignum
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index e6740af7ca6..10e882af439 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1487,7 +1487,7 @@ x_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 1487 | i = 0; | 1487 | i = 0; |
| 1488 | while (i < menu_items_used) | 1488 | while (i < menu_items_used) |
| 1489 | { | 1489 | { |
| 1490 | if (EQ (AREF (menu_items, i), Qnil)) | 1490 | if (NILP (AREF (menu_items, i))) |
| 1491 | { | 1491 | { |
| 1492 | submenu_stack[submenu_depth++] = save_wv; | 1492 | submenu_stack[submenu_depth++] = save_wv; |
| 1493 | save_wv = prev_wv; | 1493 | save_wv = prev_wv; |
| @@ -1656,7 +1656,7 @@ x_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 1656 | i = 0; | 1656 | i = 0; |
| 1657 | while (i < menu_items_used) | 1657 | while (i < menu_items_used) |
| 1658 | { | 1658 | { |
| 1659 | if (EQ (AREF (menu_items, i), Qnil)) | 1659 | if (NILP (AREF (menu_items, i))) |
| 1660 | { | 1660 | { |
| 1661 | subprefix_stack[submenu_depth++] = prefix; | 1661 | subprefix_stack[submenu_depth++] = prefix; |
| 1662 | prefix = entry; | 1662 | prefix = entry; |