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 /hyrolo-menu.el | |
| parent | 98a5ecb3bf80f2b53523c769459d1a1a49491125 (diff) | |
| parent | 332ef336a7ad87e25c0563bfeaf0e6758d52c59c (diff) | |
Merge remote-tracking branch 'hyperbole/master' into externals/hyperbolescratch/hyperbole-lexbind
Diffstat (limited to 'hyrolo-menu.el')
| -rw-r--r-- | hyrolo-menu.el | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/hyrolo-menu.el b/hyrolo-menu.el index 75e70b0..874dbe5 100644 --- a/hyrolo-menu.el +++ b/hyrolo-menu.el @@ -4,7 +4,7 @@ ;; ;; Orig-Date: 28-Oct-94 at 10:59:44 ;; -;; 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. @@ -35,9 +35,10 @@ ["Display-Prior-Matches" (id-tool-invoke 'hyrolo-display-matches) t] ["Edit-Entry" (id-tool-invoke 'hyrolo-edit) t] ["Edit-Rolo" (id-tool-invoke - '(progn (require 'hyrolo) - (find-file (car hyrolo-file-list)) - (setq buffer-read-only nil))) + '(lambda () + (require 'hyrolo) + (find-file (car hyrolo-file-list)) + (setq buffer-read-only nil))) t] ["Insert-Entry-at-Point" (id-tool-invoke 'hyrolo-yank) t] ["Mail-to-Address" (id-tool-invoke 'hyrolo-mail-to) t] @@ -112,21 +113,15 @@ ;;; Public functions ;;; ************************************************************************ -;;; This definition is used only by XEmacs and Emacs. +;;; This definition is used only by Emacs. (defun hyrolo-menubar-menu () "Add a HyRolo menu to the rolo match buffer menubar." (cond ((fboundp 'popup-mode-menu) (setq mode-popup-menu id-popup-hyrolo-menu)) - ((featurep 'xemacs) - (define-key hyrolo-mode-map 'button3 'hyrolo-popup-menu)) - (t ;; (not (featurep 'xemacs)) + (t (define-key hyrolo-mode-map [C-down-mouse-3] 'hyrolo-popup-menu) (define-key hyrolo-mode-map [C-mouse-3] nil))) - (unless (cond ((not (featurep 'xemacs)) - (global-key-binding [menu-bar Rolo])) - ((boundp 'current-menubar) - (car (find-menu-item current-menubar '("Rolo"))))) - (if (featurep 'xemacs) (set-buffer-menubar (copy-sequence current-menubar))) + (unless (global-key-binding [menu-bar Rolo]) (easy-menu-define nil hyrolo-mode-map "Rolo Menubar Menu" id-popup-hyrolo-menu) ;; Force a menu-bar update. (force-mode-line-update))) |