aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2000-08-01 10:12:00 +0000
committerEli Zaretskii <[email protected]>2000-08-01 10:12:00 +0000
commit032ebb2999b331a8150f333592ad5777e9054df4 (patch)
tree32e6070d3d6392b18137e126e0550fced0341a6d /lisp/net
parent3b5fab8756279e0b37020ad1da13cc24b5f0cff5 (diff)
(nslookup-font-lock-keywords): Don't condition font lock support
on window-system. (ftp-font-lock-keywords, smbclient-font-lock-keywords): Likewise.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/net-utils.el69
1 files changed, 33 insertions, 36 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 9a349f7637..9b3e3ee157 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -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