diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-08-14 04:29:57 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-08-14 04:29:57 -0400 |
| commit | 6e555e763567c66ad8e50724a7dd5e286dbb1e65 (patch) | |
| tree | 86fb29daa274d8007063babec826719154bf087e /kotl/kmenu.el | |
| parent | 98a5ecb3bf80f2b53523c769459d1a1a49491125 (diff) | |
| parent | 332ef336a7ad87e25c0563bfeaf0e6758d52c59c (diff) | |
Merge remote-tracking branch 'hyperbole/master' into externals/hyperbolescratch/hyperbole-lexbind
Diffstat (limited to 'kotl/kmenu.el')
| -rw-r--r-- | kotl/kmenu.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kotl/kmenu.el b/kotl/kmenu.el index cee1760..344868a 100644 --- a/kotl/kmenu.el +++ b/kotl/kmenu.el @@ -4,7 +4,7 @@ ;; ;; Orig-Date: 28-Mar-94 at 11:22:09 ;; -;; Copyright (C) 1994-2017 Free Software Foundation, Inc. +;; Copyright (C) 1994-2019 Free Software Foundation, Inc. ;; See the "../HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -197,16 +197,10 @@ (cond ((fboundp 'popup-mode-menu) (defvar mode-popup-menu) (setq mode-popup-menu id-popup-kotl-menu)) - ((featurep 'xemacs) - (define-key kotl-mode-map 'button3 'kotl-popup-menu)) - (t ;; (not (featurep 'xemacs)) + (t (define-key kotl-mode-map [C-down-mouse-3] 'kotl-popup-menu) (define-key kotl-mode-map [C-mouse-3] nil))) - (unless (cond ((not (featurep 'xemacs)) - (global-key-binding [menu-bar Koutline])) - ((boundp 'current-menubar) - (car (find-menu-item current-menubar '("Koutline"))))) - (if (featurep 'xemacs) (set-buffer-menubar (copy-sequence current-menubar))) + (unless (global-key-binding [menu-bar Koutline]) (easy-menu-define nil kotl-mode-map "Koutline Menubar Menu" id-popup-kotl-menu) ;; Force a menu-bar update. (force-mode-line-update))) |