Commit 20f28123 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(iwconfig-program-options): Doc fix.

(net-utils-run-program, run-network-program): Define as functions.
parent ca34d75a
2008-03-11 Juanma Barranquero <lekktu@gmail.com>
* net/net-utils.el (iwconfig-program-options): Doc fix.
(net-utils-run-program, run-network-program): Define as functions.
2008-03-11 Dan Nicolaescu <dann@ics.uci.edu>
 
* emacs-lisp/lisp-mode.el (lisp-interaction-mode-map): Fix typo.
......@@ -17,7 +22,8 @@
 
* Makefile.in (bootstrap-prepare): Don't chmod cal-loaddefs.el.
 
* emacs-lisp/autoload.el (autoload-find-destination): Don't force raw-text.
* emacs-lisp/autoload.el (autoload-find-destination):
Don't force raw-text.
 
* calendar/calendar.el ("cal-loaddefs"): Load, rather than require.
* calendar/cal-loaddefs.el: Don't version control.
......@@ -64,8 +70,8 @@
2008-03-10 Juanma Barranquero <lekktu@gmail.com>
 
* iswitchb.el (iswitchb-use-faces): Doc fix.
(iswitchb-buffer-ignore, iswitchb-read-buffer): Fix typos in
docstrings.
(iswitchb-buffer-ignore, iswitchb-read-buffer):
Fix typos in docstrings.
 
2008-03-10 Dan Nicolaescu <dann@ics.uci.edu>
 
......
......@@ -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)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment