diff --git a/ChangeLog b/ChangeLog index 3e11d15da9b4a6b893c1cea69171f4580454ef29_Q2hhbmdlTG9n..d3fa3e348f4b6529d67d227b968509171d603a2e_Q2hhbmdlTG9n 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,2 +1,17 @@ +1998-03-24 Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch> + + * eudc: Released 1.02 + Release and package numbers are now in synch. + + * eudc.el: Fixed compilation warnings. + +1998-03-18 Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch> + + * eudc: Released 1.01 + + * eudc.el: (eudc-expand-inline): Translate + `eudc-inline-expansion-format' before using it + (eudc-tail-menu): Synch with autoloaded menu labels + 1998-03-15 Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch> @@ -1,6 +16,6 @@ 1998-03-15 Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch> - * eudc: Released 1.0/pkg1.1 + * eudc: Released 1.0/pkg1.01 * eudc-ldap.el: (eudc-ldap-clear-inline-query-format-on-exit): New var diff --git a/Makefile b/Makefile index 3e11d15da9b4a6b893c1cea69171f4580454ef29_TWFrZWZpbGU=..d3fa3e348f4b6529d67d227b968509171d603a2e_TWFrZWZpbGU= 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Makefile for Ph lisp code +# Makefile for EUDC lisp code # This file is part of XEmacs. @@ -17,8 +17,8 @@ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.01 -AUTHOR_VERSION = 1.0 +VERSION = 1.02 +AUTHOR_VERSION = 1.02 MAINTAINER = Oscar Figueiredo <Oscar.Figueiredo@epfl.ch> PACKAGE = eudc PKG_TYPE = regular @@ -22,8 +22,8 @@ MAINTAINER = Oscar Figueiredo <Oscar.Figueiredo@epfl.ch> PACKAGE = eudc PKG_TYPE = regular -REQUIRES = xemacs-base +REQUIRES = fsf-compat xemacs-base CATEGORY = comm ELCS = eudc.elc eudc-ph.elc eudc-ldap.elc @@ -26,8 +26,8 @@ CATEGORY = comm ELCS = eudc.elc eudc-ph.elc eudc-ldap.elc -# INFO_FILES = eudc.info* +INFO_FILES = eudc.info* include ../../XEmacs.rules @@ -31,7 +31,7 @@ include ../../XEmacs.rules -all:: $(ELCS) auto-autoloads.elc custom-load.elc +all:: $(ELCS) auto-autoloads.elc custom-load.elc eudc.info srckit: srckit-std @@ -35,4 +35,4 @@ srckit: srckit-std -binkit: binkit-sourceonly +binkit: binkit-sourceinfo diff --git a/eudc.el b/eudc.el index 3e11d15da9b4a6b893c1cea69171f4580454ef29_ZXVkYy5lbA==..d3fa3e348f4b6529d67d227b968509171d603a2e_ZXVkYy5lbA== 100644 --- a/eudc.el +++ b/eudc.el @@ -70,7 +70,7 @@ (defvar eudc-supported-protocols nil "Protocols currently supported by the Unified Directory Client. This variable is updated when protocol-specific libraries -are loaded, do not change by hand.") +are loaded, *do not change by hand*.") (defcustom eudc-protocol nil "*The directory protocol to use to query the server. @@ -230,6 +230,7 @@ (featurep 'mule))) (defvar eudc-form-widget-list nil) +(defvar eudc-mode-map nil) ;; Used by the selection insertion mechanism (defvar eudc-pre-select-window-configuration nil) @@ -367,7 +368,7 @@ (setq eudc-insertion-marker (point-marker)) (with-output-to-temp-buffer "*EUDC Completions*" (display-completion-list - response-strings + choices :activate-callback 'eudc-insert-selected))) (defun eudc-insert-selected (event extent user) @@ -833,4 +834,8 @@ query query-alist (query-format eudc-inline-query-format) + (eudc-inline-expansion-format + (cons (car eudc-inline-expansion-format) + (eudc-translate-attribute-list + (cdr eudc-inline-expansion-format)))) response @@ -836,4 +841,5 @@ response + response-string response-strings key val cell) @@ -865,15 +871,16 @@ ;; Process response through eudc-inline-expansion-format (while response - (setq response-strings - (cons (apply 'format - (car eudc-inline-expansion-format) - (mapcar (function - (lambda (field) - (or (cdr (assq field (car response))) - ""))) - (cdr eudc-inline-expansion-format))) - response-strings)) + (setq response-string (apply 'format + (car eudc-inline-expansion-format) + (mapcar (function + (lambda (field) + (or (cdr (assq field (car response))) + ""))) + (cdr eudc-inline-expansion-format)))) + (if (> (length response-string) 0) + (setq response-strings + (cons response-string response-strings))) (setq response (cdr response))) (if (or @@ -1079,16 +1086,17 @@ (require 'easymenu) -(defvar eudc-mode-map (let ((map (make-sparse-keymap))) - (define-key map "q" 'kill-this-buffer) - (define-key map "x" 'kill-this-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)) +(setq eudc-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "q" 'kill-this-buffer) + (define-key map "x" 'kill-this-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)) (set-keymap-parent eudc-mode-map widget-keymap) (defconst eudc-tail-menu `(["---" nil nil] ["Query with Form" eudc-query-form t] @@ -1090,9 +1098,9 @@ (set-keymap-parent eudc-mode-map widget-keymap) (defconst eudc-tail-menu `(["---" nil nil] ["Query with Form" eudc-query-form t] - ["Inline Query" eudc-expand-inline t] + ["Expand Inline Query" eudc-expand-inline t] ["Insert Record into BBDB" eudc-insert-record-at-point-into-bbdb (and (or (featurep 'bbdb) (prog1 (locate-library "bbdb") (message "")))