diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-24 10:09:07 +0000 |
| commit | b03f96dc5a6651d1dc84b81b2a15cad6908b9809 (patch) | |
| tree | 699d727fdfb007a12a07d1e1f2e172617cc159ef /lisp/net/net-utils.el | |
| parent | 52bec650ae314402c242ce700bb09be42ef8ae55 (diff) | |
| parent | 20ca5ee4f7d897d79416a6fdd084db1eabb392b0 (diff) | |
| download | emacs-b03f96dc5a6651d1dc84b81b2a15cad6908b9809.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
Diffstat (limited to 'lisp/net/net-utils.el')
| -rw-r--r-- | lisp/net/net-utils.el | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index ea3161b3d97..c01da4fd50b 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -93,7 +93,7 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type '(repeat string)) -(defcustom ipconfig-program +(defcustom ifconfig-program (if (eq system-type 'windows-nt) "ipconfig" "ifconfig") @@ -101,11 +101,13 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type 'string) -(defcustom ipconfig-program-options +(define-obsolete-variable-alias 'ipconfig-program 'ifconfig-program "22.2") + +(defcustom ifconfig-program-options (list (if (eq system-type 'windows-nt) "/all" "-a")) - "Options for ipconfig-program." + "Options for `ifconfig-program'." :group 'net-utils :type '(repeat string)) @@ -121,6 +123,9 @@ These options can be used to limit how many ICMP packets are emitted." :type '(repeat string) :version "23.1") +(define-obsolete-variable-alias 'ipconfig-program-options + 'ifconfig-program-options "22.2") + (defcustom netstat-program "netstat" "Program to print network statistics." :group 'net-utils @@ -364,18 +369,18 @@ If your system's ping continues until interrupted, you can try setting options))) ;;;###autoload -(defun ipconfig () - "Run ipconfig program." +(defun ifconfig () + "Run ifconfig program." (interactive) (net-utils-run-program - "Ipconfig" - (concat "** Ipconfig ** " ipconfig-program " ** ") - ipconfig-program - ipconfig-program-options)) + "Ifconfig" + (concat "** Ifconfig ** " ifconfig-program " ** ") + ifconfig-program + ifconfig-program-options)) -;; This is the normal name on most Unixes. +;; Windows uses this name. ;;;###autoload -(defalias 'ifconfig 'ipconfig) +(defalias 'ipconfig 'ifconfig) ;;;###autoload (defun iwconfig () |