* net/goto-addr.el (goto-address): Mark as safe for local evals.

[gnu-emacs] / lisp / net / eudc.el

diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 96289922ccc1fb5780252d1e970a1499aedfde07..2d5d8f6978d136ee4034660a7ebd7a46f2b7c88e 100644 (file)
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,6 +1,7 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -75,6 +76,8 @@
 (defvar eudc-form-widget-list nil)
 (defvar eudc-mode-map nil)
 
+(defvar mode-popup-menu)
+
 ;; List of known servers
 ;; Alist of (SERVER . PROTOCOL)
 (defvar eudc-server-hotlist nil)
@@ -377,7 +380,7 @@ The translation is done according to
 BEG and END delimit the text which is to be replaced."
   (let ((replacement))
    (setq replacement
-        (completing-read "Multiple matches found; choose one:"
+        (completing-read "Multiple matches found; choose one: "
                          (mapcar 'list choices)))
    (delete-region beg end)
    (insert replacement)))
@@ -920,6 +923,7 @@ see `eudc-inline-expansion-servers'"
             ((eq eudc-multiple-match-handling-method 'select)
              (eudc-select response-strings beg end))
             ((eq eudc-multiple-match-handling-method 'all)
+             (delete-region beg end)
              (insert (mapconcat 'identity response-strings ", ")))
             ((eq eudc-multiple-match-handling-method 'abort)
              (error "There is more than one match for the query"))))