summaryrefslogtreecommitdiff
path: root/lisp/net/net-utils.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-03-11 10:23:09 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-03-11 10:23:09 +0000
commit20f28123b3375e4fcf844ba284705304f2072d41 (patch)
tree4a49a4b609ab1bfb21ac329fffd2ee1d62f2bb45 /lisp/net/net-utils.el
parentca34d75a59d42b2a9f11a2f6b754ef21005fbdfd (diff)
downloademacs-20f28123b3375e4fcf844ba284705304f2072d41.tar.gz
(iwconfig-program-options): Doc fix.
(net-utils-run-program, run-network-program): Define as functions.
Diffstat (limited to 'lisp/net/net-utils.el')
-rw-r--r--lisp/net/net-utils.el45
1 files changed, 20 insertions, 25 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 910dd322b6f..a34fe0815c3 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -116,7 +116,7 @@ These options can be used to limit how many ICMP packets are emitted."
:version "23.1")
(defcustom iwconfig-program-options nil
- "Options for `iwconfig-program'."
+ "Options for the iwconfig program."
:group 'net-utils
:type '(repeat string)
:version "23.1")
@@ -312,17 +312,17 @@ This variable is only used if the variable
(if moving (goto-char (process-mark process))))
(set-buffer old-buffer))))
-(defmacro net-utils-run-program (name header program &rest args)
+(defun net-utils-run-program (name header program args)
"Run a network information program."
- ` (let ((buf (get-buffer-create (concat "*" ,name "*"))))
- (set-buffer buf)
- (erase-buffer)
- (insert ,header "\n")
- (set-process-filter
- (apply 'start-process ,name buf ,program ,@args)
- 'net-utils-remove-ctrl-m-filter)
- (display-buffer buf)
- buf))
+ (let ((buf (get-buffer-create (concat "*" name "*"))))
+ (set-buffer buf)
+ (erase-buffer)
+ (insert header "\n")
+ (set-process-filter
+ (apply 'start-process name buf program args)
+ 'net-utils-remove-ctrl-m-filter)
+ (display-buffer buf)
+ buf))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Wrappers for external network programs
@@ -616,27 +616,22 @@ If your system's ping continues until interrupted, you can try setting
"Alist of services and associated TCP port numbers.
This list is not complete.")
-;; Workhorse macro
-(defmacro run-network-program (process-name host port
- &optional initial-string)
- `(let ((tcp-connection)
- (buf))
- (setq buf (get-buffer-create (concat "*" ,process-name "*")))
+;; Workhorse routine
+(defun run-network-program (process-name host port &optional initial-string)
+ (let ((tcp-connection)
+ (buf))
+ (setq buf (get-buffer-create (concat "*" process-name "*")))
(set-buffer buf)
(or
(setq tcp-connection
- (open-network-stream
- ,process-name
- buf
- ,host
- ,port))
- (error "Could not open connection to %s" ,host))
+ (open-network-stream process-name buf host port))
+ (error "Could not open connection to %s" host))
(erase-buffer)
(set-marker (process-mark tcp-connection) (point-min))
(set-process-filter tcp-connection 'net-utils-remove-ctrl-m-filter)
- (and ,initial-string
+ (and initial-string
(process-send-string tcp-connection
- (concat ,initial-string "\r\n")))
+ (concat initial-string "\r\n")))
(display-buffer buf)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;