[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/case-table.el
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/case-table.el |
Date: |
Tue, 01 Feb 2005 19:57:08 -0500 |
Index: emacs/lisp/case-table.el
diff -c emacs/lisp/case-table.el:1.28 emacs/lisp/case-table.el:1.29
*** emacs/lisp/case-table.el:1.28 Fri Jan 21 00:26:39 2005
--- emacs/lisp/case-table.el Wed Feb 2 00:57:07 2005
***************
*** 1,6 ****
;;; case-table.el --- code to extend the character set and support case tables
! ;; Copyright (C) 1988, 1994 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
--- 1,6 ----
;;; case-table.el --- code to extend the character set and support case tables
! ;; Copyright (C) 1988, 1994, 2005 Free Software Foundation, Inc.
;; Author: Howard Gayle
;; Maintainer: FSF
***************
*** 62,72 ****
(describe-vector description)
(help-mode)))))
(defun copy-case-table (case-table)
! (let ((copy (copy-sequence case-table)))
! ;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table.
! (set-char-table-extra-slot copy 0 nil)
(set-char-table-extra-slot copy 1 nil)
(set-char-table-extra-slot copy 2 nil)
copy))
--- 62,87 ----
(describe-vector description)
(help-mode)))))
+ (defun get-upcase-table (case-table)
+ "Return the upcase table of CASE-TABLE."
+ (or (char-table-extra-slot case-table 0)
+ ;; Setup all extra slots of CASE-TABLE by temporarily selecting
+ ;; it as the standard case table.
+ (let ((old (standard-case-table)))
+ (unwind-protect
+ (progn
+ (set-standard-case-table case-table)
+ (char-table-extra-slot case-table 0))
+ (or (eq case-table old)
+ (set-standard-case-table old))))))
+
(defun copy-case-table (case-table)
! (let ((copy (copy-sequence case-table))
! (up (char-table-extra-slot case-table 0)))
! ;; Clear out the extra slots (except for upcase table) so that
! ;; they will be recomputed from the main (downcase) table.
! (if up
! (set-char-table-extra-slot copy 0 (copy-sequence up)))
(set-char-table-extra-slot copy 1 nil)
(set-char-table-extra-slot copy 2 nil)
copy))
***************
*** 87,95 ****
(setq r (set-case-syntax-1 r))
(aset table l l)
(aset table r r)
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table.
! (set-char-table-extra-slot table 0 nil)
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry l (concat "(" (char-to-string r) " ")
--- 102,112 ----
(setq r (set-case-syntax-1 r))
(aset table l l)
(aset table r r)
+ (let ((up (get-upcase-table table)))
+ (aset up l l)
+ (aset up r r))
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table and upcase table.
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry l (concat "(" (char-to-string r) " ")
***************
*** 103,118 ****
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."
! (unless (= (charset-bytes (char-charset uc))
! (charset-bytes (char-charset lc)))
! (error "Can't casify chars with different `charset-bytes' values"))
(setq uc (set-case-syntax-1 uc))
(setq lc (set-case-syntax-1 lc))
(aset table uc lc)
(aset table lc lc)
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table.
! (set-char-table-extra-slot table 0 nil)
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry lc "w " (standard-syntax-table))
--- 120,165 ----
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)))
! (aset up uc uc)
! (aset up lc uc))
! ;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table and upcase table.
! (set-char-table-extra-slot table 1 nil)
! (set-char-table-extra-slot table 2 nil)
! (modify-syntax-entry lc "w " (standard-syntax-table))
! (modify-syntax-entry uc "w " (standard-syntax-table)))
!
! (defun set-upcase-syntax (uc lc table)
! "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))
! (let ((up (get-upcase-table table)))
! (aset up uc uc)
! (aset up lc uc))
! ;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table and upcase table.
! (set-char-table-extra-slot table 1 nil)
! (set-char-table-extra-slot table 2 nil)
! (modify-syntax-entry lc "w " (standard-syntax-table))
! (modify-syntax-entry uc "w " (standard-syntax-table)))
!
! (defun set-downcase-syntax (uc lc table)
! "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)
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table and upcase table.
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry lc "w " (standard-syntax-table))
***************
*** 126,134 ****
SYNTAX should be \" \", \"w\", \".\" or \"_\"."
(setq c (set-case-syntax-1 c))
(aset table c c)
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table.
! (set-char-table-extra-slot table 0 nil)
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry c syntax (standard-syntax-table)))
--- 173,182 ----
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))
;; Clear out the extra slots so that they will be
! ;; recomputed from the main (downcase) table and upcase table.
(set-char-table-extra-slot table 1 nil)
(set-char-table-extra-slot table 2 nil)
(modify-syntax-entry c syntax (standard-syntax-table)))
- [Emacs-diffs] Changes to emacs/lisp/case-table.el,
Kenichi Handa <=