From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date: Tue, 12 Jun 2018 19:28:43 +0000 (-0400)
Subject: EUDC: Shorten eudc-tools-menu autoload
X-Git-Tag: emacs-27.0.90~4560
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36d17ef44a2c9f034992e921b350664dddffb58f;p=emacs.git

EUDC: Shorten eudc-tools-menu autoload

* lisp/net/eudc.el: Remove XEmacs support from eudc-tools-menu
autoload.
---

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)))))))))))
 
 ;;}}}