diff options
Diffstat (limited to 'hinit.el')
| -rw-r--r-- | hinit.el | 21 |
1 files changed, 4 insertions, 17 deletions
@@ -4,7 +4,7 @@ ;; ;; Orig-Date: 1-Oct-91 at 02:32:51 ;; -;; Copyright (C) 1991-2017 Free Software Foundation, Inc. +;; Copyright (C) 1991-2019 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -43,10 +43,7 @@ (interactive) (unless (featurep 'infodock) ;; Initialize now since Emacs startup has finished. - (if (and (or (not (featurep 'xemacs)) - (and (boundp 'current-menubar) current-menubar)) - after-init-time) - (hyperbole-menubar-menu) + (if after-init-time (hyperbole-menubar-menu) ;; Defer initialization until after Emacs startup. This really is needed. (add-hook 'after-init-hook #'hyperbole-menubar-menu)) ;; Avoid returning the large Hyperbole menu. @@ -59,18 +56,8 @@ ;;;###autoload (defmacro hui-menu-remove (menu-sym &optional keymap) "Remove MENU-SYM menu from any menubars generated by optional KEYMAP or the global-map." - `(prog1 (cond ((not (featurep 'xemacs)) - (if (null ,keymap) (setq keymap global-map)) - (define-key (or ,keymap global-map) [menu-bar ,menu-sym] nil)) - ;; XEmacs - ((boundp 'menubar-configuration) - (if (memq ',menu-sym menubar-configuration) - (if (fboundp 'customize-set-variable) - (customize-set-variable - 'menubar-configuration - (delq ',menu-sym menubar-configuration)) - (setq menubar-configuration - (delq ',menu-sym menubar-configuration)))))) + `(prog1 (if (null ,keymap) (setq keymap global-map)) + (define-key (or ,keymap global-map) [menu-bar ,menu-sym] nil) ;; Force a menu-bar update. (force-mode-line-update))) |