diff options
| author | Po Lu | 2021-11-10 14:04:05 +0800 |
|---|---|---|
| committer | Po Lu | 2021-11-10 14:04:05 +0800 |
| commit | e9b954f0fdc91eaad32d853e82ad8cb4c53c69d2 (patch) | |
| tree | 424eb046da6c0b2e2e75651226d2c613f6da640e /lisp | |
| parent | ff9cf991c1608cd2578a66cba41e654a2b5d9144 (diff) | |
| download | emacs-e9b954f0fdc91eaad32d853e82ad8cb4c53c69d2.tar.gz emacs-e9b954f0fdc91eaad32d853e82ad8cb4c53c69d2.zip | |
Revert "Support opening the toolkit menu bar on NS"
This reverts commit ff9cf991c1608cd2578a66cba41e654a2b5d9144.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/menu-bar.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index e50d4fee487..1a81f1a3d06 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -2665,10 +2665,9 @@ first TTY menu-bar menu to be dropped down. Interactively, | |||
| 2665 | this is the numeric argument to the command. | 2665 | this is the numeric argument to the command. |
| 2666 | This function decides which method to use to access the menu | 2666 | This function decides which method to use to access the menu |
| 2667 | depending on FRAME's terminal device. On X displays, it calls | 2667 | depending on FRAME's terminal device. On X displays, it calls |
| 2668 | `x-menu-bar-open'; on Windows, `w32-menu-bar-open'; | 2668 | `x-menu-bar-open'; on Windows, `w32-menu-bar-open'; otherwise it |
| 2669 | on NS, `ns-menu-bar-open'; otherwise it calls either `popup-menu' | 2669 | calls either `popup-menu' or `tmm-menubar' depending on whether |
| 2670 | or `tmm-menubar' depending on whether `tty-menu-open-use-tmm' | 2670 | `tty-menu-open-use-tmm' is nil or not. |
| 2671 | is nil or not. | ||
| 2672 | 2671 | ||
| 2673 | If FRAME is nil or not given, use the selected frame." | 2672 | If FRAME is nil or not given, use the selected frame." |
| 2674 | (interactive | 2673 | (interactive |
| @@ -2677,7 +2676,6 @@ If FRAME is nil or not given, use the selected frame." | |||
| 2677 | (cond | 2676 | (cond |
| 2678 | ((eq type 'x) (x-menu-bar-open frame)) | 2677 | ((eq type 'x) (x-menu-bar-open frame)) |
| 2679 | ((eq type 'w32) (w32-menu-bar-open frame)) | 2678 | ((eq type 'w32) (w32-menu-bar-open frame)) |
| 2680 | ((eq type 'ns) (ns-menu-bar-open frame)) | ||
| 2681 | ((and (null tty-menu-open-use-tmm) | 2679 | ((and (null tty-menu-open-use-tmm) |
| 2682 | (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0)))) | 2680 | (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0)))) |
| 2683 | ;; Make sure the menu bar is up to date. One situation where | 2681 | ;; Make sure the menu bar is up to date. One situation where |