* wl/wl-summary.el (wl-summary-mode): Check with fboundp before calling `make-local...

[elisp/wanderlust.git] / elmo / slp.el

diff --git a/elmo/slp.el b/elmo/slp.el
index 23ca570..5805f31 100644 (file)
--- a/elmo/slp.el
+++ b/elmo/slp.el
@@ -1,4 +1,4 @@
-;;; slp.el --- A SLP interface.
+;;; slp.el --- An SLP interface.
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: SLP
@@ -27,11 +27,12 @@
 ;;
 ;; slp.el is an elisp library providing an interface for SLP (RFC2614)
 ;; using OpenSLP(http://www.openslp.org/) slptool .
-;; 
+;;
 ;;; History:
 ;; 28 Aug 2001 Created.
 
 ;;; Code:
+(eval-when-compile (require 'cl))
 
 (defgroup slp nil
   "Interface for `Service Location Protocol'."
@@ -50,10 +51,11 @@
 (defun slp-exec-wait (type &rest args)
   "Synchronous execution of slp-program.
 TYPE is a symbol (one of `srvs', `attrs', `srvtypes', `as-is', `ignore')."
-  (with-temp-buffer 
-    (let ((result (apply 'call-process slp-program nil t nil (delq nil args))))
+  (with-temp-buffer
+    (let ((result (apply 'call-process slp-program nil t nil
+                        (append slp-program-arguments (delq nil args)))))
       (unless (zerop result)
-       (error "SLP error: " (buffer-string)))
+       (error "SLP error: %s" (buffer-string)))
       (goto-char (point-min))
       (case type
        (srvs (slp-parse-srvs))