diff options
| author | Thomas Fitzsimmons | 2018-06-12 15:28:43 -0400 |
|---|---|---|
| committer | Thomas Fitzsimmons | 2018-08-15 21:42:55 -0400 |
| commit | 36d17ef44a2c9f034992e921b350664dddffb58f (patch) | |
| tree | 605ea6177afda82c4324492bb29c2c9caaabd1b2 | |
| parent | 6b178acfd1d29c9368b29e3b3291bdbde5f61d0d (diff) | |
| download | emacs-36d17ef44a2c9f034992e921b350664dddffb58f.tar.gz emacs-36d17ef44a2c9f034992e921b350664dddffb58f.zip | |
EUDC: Shorten eudc-tools-menu autoload
* lisp/net/eudc.el: Remove XEmacs support from eudc-tools-menu
autoload.
| -rw-r--r-- | lisp/net/eudc.el | 31 |
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." | |||
| 1196 | nil) | 1196 | nil) |
| 1197 | 1197 | ||
| 1198 | ;;;###autoload | 1198 | ;;;###autoload |
| 1199 | (cond | 1199 | (progn |
| 1200 | ((not (featurep 'xemacs)) | ||
| 1201 | (defvar eudc-tools-menu | 1200 | (defvar eudc-tools-menu |
| 1202 | (let ((map (make-sparse-keymap "Directory Servers"))) | 1201 | (let ((map (make-sparse-keymap "Directory Servers"))) |
| 1203 | (define-key map [phone] | 1202 | (define-key map [phone] |
| @@ -1222,34 +1221,6 @@ This does nothing except loading eudc by autoload side-effect." | |||
| 1222 | :help ,(purecopy "Load the Emacs Unified Directory Client"))) | 1221 | :help ,(purecopy "Load the Emacs Unified Directory Client"))) |
| 1223 | map)) | 1222 | map)) |
| 1224 | (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu))) | 1223 | (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu))) |
| 1225 | (t | ||
| 1226 | (let ((menu '("Directory Servers" | ||
| 1227 | ["Load Hotlist of Servers" eudc-load-eudc t] | ||
| 1228 | ["New Server" eudc-set-server t] | ||
| 1229 | ["---" nil nil] | ||
| 1230 | ["Query with Form" eudc-query-form t] | ||
| 1231 | ["Expand Inline Query" eudc-expand-inline t] | ||
| 1232 | ["---" nil nil] | ||
| 1233 | ["Get Email" eudc-get-email t] | ||
| 1234 | ["Get Phone" eudc-get-phone t]))) | ||
| 1235 | (if (not (featurep 'eudc-autoloads)) | ||
| 1236 | (if (featurep 'xemacs) | ||
| 1237 | (if (and (featurep 'menubar) | ||
| 1238 | (not (featurep 'infodock))) | ||
| 1239 | (add-submenu '("Tools") menu)) | ||
| 1240 | (require 'easymenu) | ||
| 1241 | (cond | ||
| 1242 | ((fboundp 'easy-menu-add-item) | ||
| 1243 | (easy-menu-add-item nil '("tools") | ||
| 1244 | (easy-menu-create-menu (car menu) | ||
| 1245 | (cdr menu)))) | ||
| 1246 | ((fboundp 'easy-menu-create-keymaps) | ||
| 1247 | (define-key | ||
| 1248 | global-map | ||
| 1249 | [menu-bar tools eudc] | ||
| 1250 | (cons "Directory Servers" | ||
| 1251 | (easy-menu-create-keymaps "Directory Servers" | ||
| 1252 | (cdr menu))))))))))) | ||
| 1253 | 1224 | ||
| 1254 | ;;}}} | 1225 | ;;}}} |
| 1255 | 1226 | ||