From 032ebb2999b331a8150f333592ad5777e9054df4 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 1 Aug 2000 10:12:00 +0000
Subject: [PATCH] (nslookup-font-lock-keywords): Don't condition font lock
 support on window-system. (ftp-font-lock-keywords,
 smbclient-font-lock-keywords): Likewise.

---
 lisp/ChangeLog        |  4 +++
 lisp/net/net-utils.el | 69 +++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b06d34e6ef..59245c9f134 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-08-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
+	* net/net-utils.el (nslookup-font-lock-keywords): Don't condition
+	font lock support on window-system.
+	(ftp-font-lock-keywords, smbclient-font-lock-keywords): Likewise.
+
 	* textmodes/ispell.el (ispell-highlight-spelling-error): Use
 	display-color-p, if fboundp, instead of window-system.
 
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 9a349f7637d..9b3e3ee157b 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
-- 
2.39.2