diff options
Diffstat (limited to 'lisp/case-table.el')
| -rw-r--r-- | lisp/case-table.el | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/lisp/case-table.el b/lisp/case-table.el index a69ed329cb1..dcba1d82c2b 100644 --- a/lisp/case-table.el +++ b/lisp/case-table.el @@ -35,27 +35,25 @@ ;;; Code: -(defvar set-case-syntax-offset 0) - -(defvar set-case-syntax-set-multibyte nil) - (defun describe-buffer-case-table () "Describe the case table of the current buffer." (interactive) (let ((description (make-char-table 'case-table))) (map-char-table (function (lambda (key value) - (aset - description key - (cond ((not (natnump value)) - "case-invariant") - ((/= key (downcase key)) - (concat "uppercase, matches " - (char-to-string (downcase key)))) - ((/= key (upcase key)) - (concat "lowercase, matches " - (char-to-string (upcase key)))) - (t "case-invariant"))))) + (if (consp key) + (set-char-table-range description key "case-invariant") + (aset + description key + (cond ((not (natnump value)) + "case-invariant") + ((/= key (downcase key)) + (concat "uppercase, matches " + (char-to-string (downcase key)))) + ((/= key (upcase key)) + (concat "lowercase, matches " + (char-to-string (upcase key)))) + (t "case-invariant")))))) (current-case-table)) (save-excursion (with-output-to-temp-buffer "*Help*" @@ -87,20 +85,12 @@ (set-char-table-extra-slot copy 2 nil) copy)) -(defsubst set-case-syntax-1 (char) - "Offset CHAR by `set-case-syntax-offset' if CHAR is a non-ASCII 8-bit char." - (if (and (>= char 128) (< char 256)) - (+ char set-case-syntax-offset) - char)) - (defun set-case-syntax-delims (l r table) "Make characters L and R a matching pair of non-case-converting delimiters. This sets the entries for L and R in TABLE, which is a string that will be used as the downcase part of a case table. It also modifies `standard-syntax-table' to indicate left and right delimiters." - (setq l (set-case-syntax-1 l)) - (setq r (set-case-syntax-1 r)) (aset table l l) (aset table r r) (let ((up (get-upcase-table table))) @@ -121,8 +111,6 @@ This sets the entries for characters UC and LC in TABLE, which is a string that will be used as the downcase part of a case table. It also modifies `standard-syntax-table' to give them the syntax of word constituents." - (setq uc (set-case-syntax-1 uc)) - (setq lc (set-case-syntax-1 lc)) (aset table uc lc) (aset table lc lc) (let ((up (get-upcase-table table))) @@ -139,8 +127,6 @@ word constituents." "Make character UC an upcase of character LC. It also modifies `standard-syntax-table' to give them the syntax of word constituents." - (setq uc (set-case-syntax-1 uc)) - (setq lc (set-case-syntax-1 lc)) (aset table lc lc) (let ((up (get-upcase-table table))) (aset up uc uc) @@ -156,8 +142,6 @@ word constituents." "Make character LC a downcase of character UC. It also modifies `standard-syntax-table' to give them the syntax of word constituents." - (setq uc (set-case-syntax-1 uc)) - (setq lc (set-case-syntax-1 lc)) (aset table uc lc) (aset table lc lc) (let ((up (get-upcase-table table))) @@ -175,7 +159,6 @@ This sets the entry for character C in TABLE, which is a string that will be used as the downcase part of a case table. It also modifies `standard-syntax-table'. SYNTAX should be \" \", \"w\", \".\" or \"_\"." - (setq c (set-case-syntax-1 c)) (aset table c c) (let ((up (get-upcase-table table))) (aset up c c)) |