diff options
| author | Eli Zaretskii | 2013-09-05 15:43:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-05 15:43:11 +0300 |
| commit | 5877bb8d7e55eda3f81a36bfabe4dd816a34269f (patch) | |
| tree | 779550b544f248132cd97c819070fb8aa0aa8bd7 /src/menu.c | |
| parent | e7873136dd8dbacbbebf534500355d29a07fed8e (diff) | |
| download | emacs-5877bb8d7e55eda3f81a36bfabe4dd816a34269f.tar.gz emacs-5877bb8d7e55eda3f81a36bfabe4dd816a34269f.zip | |
Removed unnecessary tests for GUI sessions and created menu faces.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/menu.c b/src/menu.c index 2b199ffdf09..b9d1b7668b1 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -1077,8 +1077,6 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 1077 | { | 1077 | { |
| 1078 | bool get_current_pos_p = 0; | 1078 | bool get_current_pos_p = 0; |
| 1079 | 1079 | ||
| 1080 | check_window_system (SELECTED_FRAME ()); | ||
| 1081 | |||
| 1082 | /* Decode the first argument: find the window and the coordinates. */ | 1080 | /* Decode the first argument: find the window and the coordinates. */ |
| 1083 | if (EQ (position, Qt) | 1081 | if (EQ (position, Qt) |
| 1084 | || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) | 1082 | || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) |
| @@ -1194,11 +1192,6 @@ no quit occurs and `x-popup-menu' returns nil. */) | |||
| 1194 | xpos += XINT (x); | 1192 | xpos += XINT (x); |
| 1195 | ypos += XINT (y); | 1193 | ypos += XINT (y); |
| 1196 | 1194 | ||
| 1197 | /* FIXME: Find a more general check! */ | ||
| 1198 | if (!(FRAME_X_P (f) || FRAME_MSDOS_P (f) | ||
| 1199 | || FRAME_W32_P (f) || FRAME_NS_P (f))) | ||
| 1200 | error ("Can not put GUI menu on this terminal"); | ||
| 1201 | |||
| 1202 | XSETFRAME (Vmenu_updating_frame, f); | 1195 | XSETFRAME (Vmenu_updating_frame, f); |
| 1203 | } | 1196 | } |
| 1204 | #endif /* HAVE_MENUS */ | 1197 | #endif /* HAVE_MENUS */ |