;;; eudc.el --- Emacs Unified Directory Client
-;; Copyright (C) 1998, 1999, 2000, 2002 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>
;; 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
(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)
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)))
(if eudc-emacs-p
(easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu))
(setq mode-popup-menu (eudc-menu)))
- (run-hooks 'eudc-mode-hook)
- )
+ (run-mode-hooks 'eudc-mode-hook))
;;}}}
((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"))))
;;; Load the options file
(if (and (not noninteractive)
(and (locate-library eudc-options-file)
- (message "")) ; Remove modeline message
+ (progn (message "") t)) ; Remove modeline message
(not (featurep 'eudc-options-file)))
(load eudc-options-file))