summaryrefslogtreecommitdiff
path: root/lisp/net/net-utils.el
diff options
context:
space:
mode:
authorPeter Breton <pbreton@attbi.com>2000-10-05 02:48:41 +0000
committerPeter Breton <pbreton@attbi.com>2000-10-05 02:48:41 +0000
commit3478046b5a77d90186d35e66613d4cfa89801fe3 (patch)
tree860a4ff31a769e662aad1ddef63ccded5c27e126 /lisp/net/net-utils.el
parent8a677d4fdd85e4275d8aac26254c8fdd090d2ff4 (diff)
downloademacs-3478046b5a77d90186d35e66613d4cfa89801fe3.tar.gz
(nslookup-font-lock-keywords, ftp-font-lock-keywords,
smbclient-font-lock-keywords): Ignore value of window-system; always define the keywords
Diffstat (limited to 'lisp/net/net-utils.el')
-rw-r--r--lisp/net/net-utils.el71
1 files changed, 34 insertions, 37 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 1f05b3f12bf..9f98b7f8091 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -3,7 +3,7 @@
;; Author: Peter Breton <pbreton@cs.umb.edu>
;; Created: Sun Mar 16 1997
;; Keywords: network communications
-;; Time-stamp: <2000-10-04 01:32:16 pbreton>
+;; Time-stamp: <2000-10-04 22:39:05 pbreton>
;; This file is part of GNU Emacs.
@@ -227,54 +227,51 @@ These options can be used to limit how many ICMP packets are emitted."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defconst nslookup-font-lock-keywords
- (and window-system
- (progn
- (require 'font-lock)
- (list
- (list nslookup-prompt-regexp 0 font-lock-reference-face)
- (list "^[A-Za-z0-9 _]+:" 0 font-lock-type-face)
- (list "\\<\\(SOA\\|NS\\|MX\\|A\\|CNAME\\)\\>"
- 1 font-lock-keyword-face)
- ;; Dotted quads
- (list
- (mapconcat 'identity
- (make-list 4 "[0-9]+")
- "\\.")
- 0 font-lock-variable-name-face)
- ;; Host names
- (list
- (let ((host-expression "[-A-Za-z0-9]+"))
- (concat
- (mapconcat 'identity
- (make-list 2 host-expression)
- "\\.")
- "\\(\\." host-expression "\\)*")
- )
- 0 font-lock-variable-name-face)
- )))
- "Expressions to font-lock for nslookup.")
+ (progn
+ (require 'font-lock)
+ (list
+ (list nslookup-prompt-regexp 0 font-lock-reference-face)
+ (list "^[A-Za-z0-9 _]+:" 0 font-lock-type-face)
+ (list "\\<\\(SOA\\|NS\\|MX\\|A\\|CNAME\\)\\>"
+ 1 font-lock-keyword-face)
+ ;; Dotted quads
+ (list
+ (mapconcat 'identity
+ (make-list 4 "[0-9]+")
+ "\\.")
+ 0 font-lock-variable-name-face)
+ ;; Host names
+ (list
+ (let ((host-expression "[-A-Za-z0-9]+"))
+ (concat
+ (mapconcat 'identity
+ (make-list 2 host-expression)
+ "\\.")
+ "\\(\\." host-expression "\\)*")
+ )
+ 0 font-lock-variable-name-face)
+ ))
+ "Expressions to font-lock for nslookup.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; FTP goodies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defconst ftp-font-lock-keywords
- (and window-system
- (progn
- (require 'font-lock)
- (list
- (list ftp-prompt-regexp 0 font-lock-reference-face)))))
+ (progn
+ (require 'font-lock)
+ (list
+ (list ftp-prompt-regexp 0 font-lock-reference-face))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; smbclient goodies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defconst smbclient-font-lock-keywords
- (and window-system
- (progn
- (require 'font-lock)
- (list
- (list smbclient-prompt-regexp 0 font-lock-reference-face)))))
+ (progn
+ (require 'font-lock)
+ (list
+ (list smbclient-prompt-regexp 0 font-lock-reference-face))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Utility functions