diff options
Diffstat (limited to 'lisp/textmodes/dns-mode.el')
-rw-r--r-- | lisp/textmodes/dns-mode.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el index 5344d6127fe..06e944815a7 100644 --- a/lisp/textmodes/dns-mode.el +++ b/lisp/textmodes/dns-mode.el @@ -45,6 +45,8 @@ ;;; Code: +(eval-when-compile (require 'cl-lib)) + (defgroup dns-mode nil "DNS master file mode configuration." :group 'data) @@ -112,9 +114,9 @@ "26.1" 'set) (defcustom dns-mode-font-lock-keywords - `((,(concat "^$" (regexp-opt dns-mode-control-entities)) + `((,(concat "^\\$" (regexp-opt dns-mode-control-entities)) 0 ,dns-mode-control-entity-face) - ("^$[a-z0-9A-Z]+" 0 ,dns-mode-bad-control-entity-face) + ("^\\$[a-z0-9A-Z]+" 0 ,dns-mode-bad-control-entity-face) (,(regexp-opt dns-mode-classes) 0 ,dns-mode-class-face) (,(regexp-opt dns-mode-types) 0 ,dns-mode-type-face)) "Font lock keywords used to highlight text in DNS master file mode." @@ -178,9 +180,8 @@ Turning on DNS mode runs `dns-mode-hook'." (set (make-local-variable 'comment-start) ";") (set (make-local-variable 'comment-end) "") (set (make-local-variable 'comment-start-skip) ";+ *") - (unless (featurep 'xemacs) - (set (make-local-variable 'font-lock-defaults) - '(dns-mode-font-lock-keywords nil nil ((?_ . "w"))))) + (set (make-local-variable 'font-lock-defaults) + '(dns-mode-font-lock-keywords nil nil ((?_ . "w")))) (add-hook 'before-save-hook 'dns-mode-soa-maybe-increment-serial nil t) (easy-menu-add dns-mode-menu dns-mode-map)) @@ -290,9 +291,9 @@ Examples: (skip-syntax-backward " ") (skip-syntax-backward "w_.") (re-search-forward "\\([[:xdigit:]:]+\\)\\(/-?[0-9]\\{2,3\\}\\)?") - (kill-new (match-string 0)) (let ((address (match-string 1)) (prefix-length (match-string 2))) + (kill-new (match-string 0)) (when prefix-length (setq prefix-length (string-to-number (substring prefix-length 1))) (if negate-prefix |