summaryrefslogtreecommitdiff
path: root/lisp/net/eudc.el
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@fitzsim.org>2018-06-12 15:28:43 -0400
committerThomas Fitzsimmons <fitzsim@fitzsim.org>2018-08-15 21:42:55 -0400
commit36d17ef44a2c9f034992e921b350664dddffb58f (patch)
tree605ea6177afda82c4324492bb29c2c9caaabd1b2 /lisp/net/eudc.el
parent6b178acfd1d29c9368b29e3b3291bdbde5f61d0d (diff)
downloademacs-36d17ef44a2c9f034992e921b350664dddffb58f.tar.gz
EUDC: Shorten eudc-tools-menu autoload
* lisp/net/eudc.el: Remove XEmacs support from eudc-tools-menu autoload.
Diffstat (limited to 'lisp/net/eudc.el')
-rw-r--r--lisp/net/eudc.el31
1 files changed, 1 insertions, 30 deletions
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 00d8c60311b..ff8ed2c1394 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1196,8 +1196,7 @@ This does nothing except loading eudc by autoload side-effect."
nil)
;;;###autoload
-(cond
- ((not (featurep 'xemacs))
+(progn
(defvar eudc-tools-menu
(let ((map (make-sparse-keymap "Directory Servers")))
(define-key map [phone]
@@ -1222,34 +1221,6 @@ This does nothing except loading eudc by autoload side-effect."
:help ,(purecopy "Load the Emacs Unified Directory Client")))
map))
(fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu)))
- (t
- (let ((menu '("Directory Servers"
- ["Load Hotlist of Servers" eudc-load-eudc t]
- ["New Server" eudc-set-server t]
- ["---" nil nil]
- ["Query with Form" eudc-query-form t]
- ["Expand Inline Query" eudc-expand-inline t]
- ["---" nil nil]
- ["Get Email" eudc-get-email t]
- ["Get Phone" eudc-get-phone t])))
- (if (not (featurep 'eudc-autoloads))
- (if (featurep 'xemacs)
- (if (and (featurep 'menubar)
- (not (featurep 'infodock)))
- (add-submenu '("Tools") menu))
- (require 'easymenu)
- (cond
- ((fboundp 'easy-menu-add-item)
- (easy-menu-add-item nil '("tools")
- (easy-menu-create-menu (car menu)
- (cdr menu))))
- ((fboundp 'easy-menu-create-keymaps)
- (define-key
- global-map
- [menu-bar tools eudc]
- (cons "Directory Servers"
- (easy-menu-create-keymaps "Directory Servers"
- (cdr menu)))))))))))
;;}}}