(eudc-ph-open-session): Remove XEmacs case.

Minor coding style fixes.

diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index a3c8f80177f54e61d7ad3b5a7ba66ee0cf4434d1..68d03979f487747f7afb0547436001fb8c503465 100644 (file)
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -24,14 +24,14 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
+
 ;;    This library provides specific CCSO PH/QI protocol support for the
-;;    Emacs Unified Directory Client package
+;;    Emacs Unified Directory Client package.
 
 ;;; Code:
 
 (require 'eudc)
 
-
 ;;{{{      Internal cooking
 
 (eudc-protocol-set 'eudc-bbdb-conversion-alist 'eudc-ph-bbdb-conversion-alist 'ph)
@@ -45,9 +45,6 @@
 (defconst eudc-ph-default-server-port 105
   "Default TCP port for CCSO PH/QI directory services.")
 
-
-
-
 (defun eudc-ph-query-internal (query &optional return-fields)
   "Query the PH/QI server with QUERY.
 QUERY can be a string NAME or a list made of strings NAME
@@ -86,7 +83,6 @@ are returned"
       (eudc-ph-parse-query-result)
     (mapcar 'eudc-caar (eudc-ph-parse-query-result))))
 
-
 (defun eudc-ph-parse-query-result (&optional fields)
   "Return a list of alists of key/values from in `eudc-ph-process-buffer'.
 Fields not in FIELDS are discarded."
@@ -140,11 +136,9 @@ Fields not in FIELDS are discarded."
             (setq record (if (not (eq 'list eudc-duplicate-attribute-handling-method))
                              (eudc-filter-duplicate-attributes record)
                            (list record)))
-            (setq records (append record records))))
-      )
+            (setq records (append record records)))))
     (message "Done")
-    records)
-  )
+    records))
 
 (defun eudc-ph-do-request (request)
   "Send REQUEST to the server.
@@ -192,15 +186,12 @@ SERVER is either a string naming the server or a list (NAME PORT)."
       (process-kill-without-query process)
       process)))
 
-
 (defun eudc-ph-close-session (process)
   (save-excursion
     (set-buffer (process-buffer process))
     (eudc-ph-send-command process "quit")
     (eudc-ph-read-response process)
-    (if (fboundp 'add-async-timeout)
-       (add-async-timeout 10 'delete-process process)
-      (run-at-time 2 nil 'delete-process process))))
+    (run-at-time 2 nil 'delete-process process)))
 
 (defun eudc-ph-send-command (process command)
   (goto-char (point-max))
@@ -249,7 +240,6 @@ depending on RETURN-RESPONSE."
 
 ;;}}}
 
-
 (eudc-register-protocol 'ph)
 
 (provide 'eudcb-ph)