diff options
Diffstat (limited to 'lisp/net/eudc.el')
| -rw-r--r-- | lisp/net/eudc.el | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index f61929c9ef8..6459c52afee 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -49,10 +49,6 @@ (require 'cl-lib) -(eval-and-compile - (if (not (fboundp 'make-overlay)) - (require 'overlay))) - (unless (fboundp 'custom-menu-create) (autoload 'custom-menu-create "cus-edit")) @@ -69,12 +65,12 @@ (defvar eudc-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map widget-keymap) - (define-key map "q" 'kill-current-buffer) - (define-key map "x" 'kill-current-buffer) - (define-key map "f" 'eudc-query-form) - (define-key map "b" 'eudc-try-bbdb-insert) - (define-key map "n" 'eudc-move-to-next-record) - (define-key map "p" 'eudc-move-to-previous-record) + (define-key map "q" #'kill-current-buffer) + (define-key map "x" #'kill-current-buffer) + (define-key map "f" #'eudc-query-form) + (define-key map "b" #'eudc-try-bbdb-insert) + (define-key map "n" #'eudc-move-to-next-record) + (define-key map "p" #'eudc-move-to-previous-record) map)) (defvar mode-popup-menu) @@ -411,7 +407,7 @@ if any, is called to print the value in cdr of FIELD." (val (cdr field))) (if match (progn - (eval (list (cdr match) val)) + (funcall (cdr match) val) (insert "\n")) (mapc (lambda (val-elem) @@ -1056,8 +1052,6 @@ queries the server for the existing fields and displays a corresponding form." ;;{{{ Menus and keymaps -(require 'easymenu) - (defconst eudc-custom-generated-menu (cdr (custom-menu-create 'eudc))) (defconst eudc-tail-menu @@ -1114,12 +1108,12 @@ queries the server for the existing fields and displays a corresponding form." proto-name))) (if (not (fboundp command)) (fset command - `(lambda () - (interactive) - (eudc-set-server ,server (quote ,protocol)) - (message "Selected directory server is now %s (%s)" - ,server - ,proto-name)))) + (lambda () + (interactive) + (eudc-set-server server protocol) + (message "Selected directory server is now %s (%s)" + server + proto-name)))) (vector (format "%s (%s)" server proto-name) command :style 'radio @@ -1135,7 +1129,9 @@ queries the server for the existing fields and displays a corresponding form." (cons "Directory Servers" (easy-menu-create-menu "Directory Servers" (cdr (eudc-menu)))))) -;;; Load time initializations : +;;}}} + +;;{{{ Load time initializations ;; Load the options file (if (and (not noninteractive) |