[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v |
Date: |
Tue, 26 Feb 2008 04:31:21 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/02/26 04:31:21
Index: net-utils.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/net-utils.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- net-utils.el 24 Feb 2008 10:09:04 -0000 1.30
+++ net-utils.el 26 Feb 2008 04:31:20 -0000 1.31
@@ -46,8 +46,6 @@
;;; Code:
-(eval-when-compile
- (require 'comint))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Customization Variables
@@ -244,21 +242,16 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defconst nslookup-font-lock-keywords
- (progn
- (defvar font-lock-type-face)
- (defvar font-lock-keyword-face)
- (defvar font-lock-variable-name-face)
- (require 'font-lock)
(list
- (list "^[A-Za-z0-9 _]+:" 0 font-lock-type-face)
+ (list "^[A-Za-z0-9 _]+:" 0 'font-lock-type-face)
(list "\\<\\(SOA\\|NS\\|MX\\|A\\|CNAME\\)\\>"
- 1 font-lock-keyword-face)
+ 1 'font-lock-keyword-face)
;; Dotted quads
(list
(mapconcat 'identity
(make-list 4 "[0-9]+")
"\\.")
- 0 font-lock-variable-name-face)
+ 0 'font-lock-variable-name-face)
;; Host names
(list
(let ((host-expression "[-A-Za-z0-9]+"))
@@ -267,7 +260,7 @@
(make-list 2 host-expression)
"\\.")
"\\(\\." host-expression "\\)*"))
- 0 font-lock-variable-name-face)))
+ 0 'font-lock-variable-name-face))
"Expressions to font-lock for nslookup.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -453,10 +446,14 @@
(defun nslookup ()
"Run nslookup program."
(interactive)
- (require 'comint)
(comint-run nslookup-program)
(nslookup-mode))
+(defvar comint-prompt-regexp)
+(defvar comint-input-autoexpand)
+
+(autoload 'comint-mode "comint" nil t)
+
;; 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."
@@ -484,20 +481,17 @@
(list "DNS Lookup" host dns-lookup-program)
" ** "))
dns-lookup-program
- options
- )))
+ options)))
+
+(autoload 'ffap-string-at-point "ffap")
;;;###autoload
(defun run-dig (host)
"Run dig program."
(interactive
(list
- (progn
- (require 'ffap)
- (read-from-minibuffer
- "Lookup host: "
- (with-no-warnings
- (or (ffap-string-at-point 'machine) ""))))))
+ (read-from-minibuffer "Lookup host: "
+ (or (ffap-string-at-point 'machine) ""))))
(net-utils-run-program
"Dig"
(concat "** "
@@ -507,6 +501,8 @@
dig-program
(list host)))
+(autoload 'comint-exec "comint")
+
;; This is a lot less than ange-ftp, but much simpler.
;;;###autoload
(defun ftp (host)
@@ -515,7 +511,6 @@
(list
(read-from-minibuffer
"Ftp to Host: " (net-utils-machine-at-point))))
- (require 'comint)
(let ((buf (get-buffer-create (concat "*ftp [" host "]*"))))
(set-buffer buf)
(ftp-mode)
@@ -550,7 +545,6 @@
(read-from-minibuffer
"Connect to Host: " (net-utils-machine-at-point))
(read-from-minibuffer "SMB Service: ")))
- (require 'comint)
(let* ((name (format "smbclient [%s\\%s]" host service))
(buf (get-buffer-create (concat "*" name "*")))
(service-name (concat "\\\\" host "\\" service)))
@@ -827,7 +821,6 @@
(defun network-service-connection (host service)
"Open a network connection to SERVICE on HOST."
- (require 'comint)
(let* ((process-name (concat "Network Connection [" host " " service "]"))
(portnum (string-to-number service))
(buf (get-buffer-create (concat "*" process-name "*"))))
@@ -840,6 +833,8 @@
(network-connection-mode-setup host service)
(pop-to-buffer buf)))
+(defvar comint-input-ring)
+
(defun network-connection-reconnect ()
"Reconnect a network connection, preserving the old input ring."
(interactive)
- [Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v, Glenn Morris, 2008/02/23
- [Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v, Glenn Morris, 2008/02/23
- [Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v, Miles Bader, 2008/02/24
- [Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/net/net-utils.el,v, Miles Bader, 2008/02/29