From 3478046b5a77d90186d35e66613d4cfa89801fe3 Mon Sep 17 00:00:00 2001 From: Peter Breton Date: Thu, 5 Oct 2000 02:48:41 +0000 Subject: [PATCH] (nslookup-font-lock-keywords, ftp-font-lock-keywords, smbclient-font-lock-keywords): Ignore value of window-system; always define the keywords --- lisp/ChangeLog | 6 ++++ lisp/net/net-utils.el | 71 +++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b3b3477d4d..d6a76f4116a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2000-10-04 Peter Breton + + * net/net-utils.el (nslookup-font-lock-keywords) + (ftp-font-lock-keywords, smbclient-font-lock-keywords): + Ignore the value of wqindow-system; always define keywords + 2000-10-05 Kenichi Handa * startup.el (fancy-splash-screens): Remove the code for 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 ;; 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 -- 2.39.2