(newsticker--insert-image): Update docstring. Insert the image directly.

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

diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index f234ab059d5925cbd09e6a5fb6f8ea9a17e0b651..291bcbf481365eaec0ac1b729303d68359ab30ca 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, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;    This package provides a common interface to query directory servers using
@@ -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"))))