Commits

steveb  committed d3fa3e3

Synch to v1.02

  • Participants
  • Parent commits 3e11d15

Comments (0)

Files changed (3)

+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>
 
-	* 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
-# Makefile for Ph lisp code
+# Makefile for EUDC lisp code
 
 # This file is part of XEmacs.
 
 # 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
-REQUIRES = xemacs-base
+REQUIRES = fsf-compat xemacs-base
 CATEGORY = comm
 
 ELCS = eudc.elc eudc-ph.elc eudc-ldap.elc
 
-# INFO_FILES = eudc.info*
+INFO_FILES = eudc.info*
 
 include ../../XEmacs.rules
 
-all:: $(ELCS) auto-autoloads.elc custom-load.elc
+all:: $(ELCS) auto-autoloads.elc custom-load.elc eudc.info
 
 srckit: srckit-std
 
-binkit: binkit-sourceonly
+binkit: binkit-sourceinfo
 (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.
 				  (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)
   (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)
 	 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
+	 response-string
 	 response-strings
 	 key val cell)
     
 
       ;; 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
 
 (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]
-    ["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 "")))