diff options
author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2018-08-15 13:16:25 -0400 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2018-08-15 21:43:00 -0400 |
commit | af991f15e6d6479e3b4c5a545df4fb09458d100a (patch) | |
tree | e41cbf35c0f927ce048103c829a367b12ae36ea8 /lisp/net/eudc.el | |
parent | 36d17ef44a2c9f034992e921b350664dddffb58f (diff) | |
download | emacs-af991f15e6d6479e3b4c5a545df4fb09458d100a.tar.gz |
EUDC: Remove XEmacs support
* lisp/net/eudc.el (eudc-mode, eudc-install-menu): Remove
XEmacs support.
* lisp/net/eudc-hotlist.el (eudc-hotlist-mode)
(eudc-hotlist-emacs-menu): Likewise.
* lisp/net/eudc-bob.el (eudc-bob-toggle-inline-display)
(eudc-bob-popup-menu, eudc-bob-generic-keymap)
(eudc-bob-sound-keymap, eudc-bob-url-keymap)
(eudc-bob-mail-keymap): Likewise.
* etc/NEWS (EUDC): Mention removal of XEmacs support.
Diffstat (limited to 'lisp/net/eudc.el')
-rw-r--r-- | lisp/net/eudc.el | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index ff8ed2c1394..a28fa6aa17a 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -630,9 +630,7 @@ These are the special commands of EUDC mode: n -- Move to next record. p -- Move to previous record. b -- Insert record at point into the BBDB database." - (if (not (featurep 'xemacs)) - (easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu)) - (setq mode-popup-menu (eudc-menu)))) + (easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu))) ;;}}} @@ -1140,33 +1138,11 @@ queries the server for the existing fields and displays a corresponding form." eudc-tail-menu))) (defun eudc-install-menu () - (cond - ((and (featurep 'xemacs) (featurep 'menubar)) - (add-submenu '("Tools") (eudc-menu))) - ((not (featurep 'xemacs)) - (cond - ((fboundp 'easy-menu-create-menu) - (define-key - global-map - [menu-bar tools directory-search] - (cons "Directory Servers" - (easy-menu-create-menu "Directory Servers" (cdr (eudc-menu)))))) - ((fboundp 'easy-menu-add-item) - (let ((menu (eudc-menu))) - (easy-menu-add-item nil '("tools") (easy-menu-create-menu (car menu) - (cdr menu))))) - ((fboundp 'easy-menu-create-keymaps) - (easy-menu-define eudc-menu-map eudc-mode-map "Directory Client Menu" (eudc-menu)) - (define-key - global-map - [menu-bar tools eudc] - (cons "Directory Servers" - (easy-menu-create-keymaps "Directory Servers" - (cdr (eudc-menu)))))) - (t - (error "Unknown version of easymenu")))) - )) - + (define-key + global-map + [menu-bar tools directory-search] + (cons "Directory Servers" + (easy-menu-create-menu "Directory Servers" (cdr (eudc-menu)))))) ;;; Load time initializations : @@ -1182,7 +1158,7 @@ queries the server for the existing fields and displays a corresponding form." (eudc-install-menu)) -;; The following installs a short menu for EUDC at XEmacs startup. +;; The following installs a short menu for EUDC at Emacs startup. ;;;###autoload (defun eudc-load-eudc () |