Mercurial > emacs

changeset 30548:716c9bd98063

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(nslookup-font-lock-keywords): Don't condition font lock support on window-system. (ftp-font-lock-keywords, smbclient-font-lock-keywords): Likewise.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 01 Aug 2000 10:10:31 +0000
parents 3c9d5a5f0e2b
children e8eb478c6634
files lisp/net/net-utils.el
diffstat 1 files changed, 33 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/net/net-utils.el	Tue Aug 01 06:25:13 2000 +0000
+++ b/lisp/net/net-utils.el	Tue Aug 01 10:10:31 2000 +0000
@@ -227,54 +227,51 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (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