summaryrefslogtreecommitdiff
path: root/lisp/nxml/rng-cmpct.el
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-11-04 15:00:02 +0100
committerStefan Kangas <stefankangas@gmail.com>2022-11-04 15:04:45 +0100
commitf0f960050b1d3931331bf0ce42d2e106f8c7832b (patch)
tree9774114fe9dbdb9357880445faf8486e88476111 /lisp/nxml/rng-cmpct.el
parent0dcdc60dded3d74f17bf6536e39bc199b47261ef (diff)
downloademacs-f0f960050b1d3931331bf0ce42d2e106f8c7832b.tar.gz
Normalize some syntax table definitions
* lisp/nxml/rng-cmpct.el (rng-c-syntax-table): * lisp/progmodes/cperl-mode.el (cperl-mode-syntax-table) (cperl-string-syntax-table2): * lisp/progmodes/dcl-mode.el (dcl-mode-syntax-table): Normalize definitions to better follow modern ELisp conventions.
Diffstat (limited to 'lisp/nxml/rng-cmpct.el')
-rw-r--r--lisp/nxml/rng-cmpct.el22
1 files changed, 10 insertions, 12 deletions
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 453c2b736dd..85db33b9a9b 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -1,6 +1,6 @@
;;; rng-cmpct.el --- parsing of RELAX NG Compact Syntax schemas -*- lexical-binding:t -*-
-;; Copyright (C) 2003, 2007-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2022 Free Software Foundation, Inc.
;; Author: James Clark
;; Keywords: wp, hypermedia, languages, XML, RelaxNG
@@ -82,19 +82,17 @@ Return a pattern."
(concat "\\`\\(" (regexp-opt rng-c-keywords) "\\)\\'")
"Regular expression to match a keyword in the compact syntax.")
-(defvar rng-c-syntax-table nil
+(defvar rng-c-syntax-table
+ (let ((st (make-syntax-table)))
+ (modify-syntax-entry ?# "<" st)
+ (modify-syntax-entry ?\n ">" st)
+ (modify-syntax-entry ?- "w" st)
+ (modify-syntax-entry ?. "w" st)
+ (modify-syntax-entry ?_ "w" st)
+ (modify-syntax-entry ?: "_" st)
+ st)
"Syntax table for parsing the compact syntax.")
-(if rng-c-syntax-table
- ()
- (setq rng-c-syntax-table (make-syntax-table))
- (modify-syntax-entry ?# "<" rng-c-syntax-table)
- (modify-syntax-entry ?\n ">" rng-c-syntax-table)
- (modify-syntax-entry ?- "w" rng-c-syntax-table)
- (modify-syntax-entry ?. "w" rng-c-syntax-table)
- (modify-syntax-entry ?_ "w" rng-c-syntax-table)
- (modify-syntax-entry ?: "_" rng-c-syntax-table))
-
(defconst rng-c-literal-1-re
"'\\(''\\([^']\\|'[^']\\|''[^']\\)*''\\|[^'\n]*\\)'"
"Regular expression to match a single-quoted literal.")