diff options
Diffstat (limited to 'lisp/net/net-utils.el')
| -rw-r--r-- | lisp/net/net-utils.el | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index f13b1348b88..d75b36051f0 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -1,7 +1,6 @@ ;;; net-utils.el --- network functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1998-2011 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Mar 16 1997 @@ -55,8 +54,7 @@ :group 'comm :version "20.3") -(defcustom net-utils-remove-ctl-m - (member system-type (list 'windows-nt 'msdos)) +(defcustom net-utils-remove-ctl-m (memq system-type '(windows-nt msdos)) "If non-nil, remove control-Ms from output." :group 'net-utils :type 'boolean) @@ -82,7 +80,7 @@ ;; On GNU/Linux and Irix, the system's ping program seems to send packets ;; indefinitely unless told otherwise (defcustom ping-program-options - (and (memq system-type (list 'linux 'gnu/linux 'irix)) + (and (memq system-type '(gnu/linux irix)) (list "-c" "4")) "Options for the ping program. These options can be used to limit how many ICMP packets are emitted." @@ -492,6 +490,11 @@ If your system's ping continues until interrupted, you can try setting (autoload 'comint-mode "comint" nil t) +(defvar nslookup-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\t" 'comint-dynamic-complete) + map)) + ;; Using a derived mode gives us keymaps, hooks, etc. (define-derived-mode nslookup-mode comint-mode "Nslookup" "Major mode for interacting with the nslookup program." @@ -501,8 +504,6 @@ If your system's ping continues until interrupted, you can try setting (setq comint-prompt-regexp nslookup-prompt-regexp) (setq comint-input-autoexpand t)) -(define-key nslookup-mode-map "\t" 'comint-dynamic-complete) - ;;;###autoload (defun dns-lookup-host (host) "Lookup the DNS information for HOST (name or IP address)." @@ -558,6 +559,12 @@ If your system's ping continues until interrupted, you can try setting (list host))) (pop-to-buffer buf))) +(defvar ftp-mode-map + (let ((map (make-sparse-keymap))) + ;; Occasionally useful + (define-key map "\t" 'comint-dynamic-complete) + map)) + (define-derived-mode ftp-mode comint-mode "FTP" "Major mode for interacting with the ftp program." (setq comint-prompt-regexp ftp-prompt-regexp) @@ -573,9 +580,6 @@ If your system's ping continues until interrupted, you can try setting (add-hook 'comint-output-filter-functions 'comint-watch-for-password-prompt nil t))) -;; Occasionally useful -(define-key ftp-mode-map "\t" 'comint-dynamic-complete) - (defun smbclient (host service) "Connect to SERVICE on HOST via SMB." (interactive @@ -889,5 +893,4 @@ from SEARCH-STRING. With argument, prompt for whois server." (provide 'net-utils) -;; arch-tag: 97119e91-9edb-4376-838b-bf7058fa1314 ;;; net-utils.el ends here |