[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#35689: Customizable char-fold
From: |
Juri Linkov |
Subject: |
bug#35689: Customizable char-fold |
Date: |
Mon, 13 May 2019 23:31:58 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) |
>>> This patch adds long-awaited customization to char-fold.el:
>>
>> I noticed that its compilation fails with:
>>
>> ELC char-fold.elc
>> In toplevel form:
>> char-fold.el:153:31:Error: Symbol's value as variable is void:
>> char-fold-include-base
>> Makefile:296: recipe for target 'char-fold.elc' failed
>> make[2]: *** [char-fold.elc] Error 1
>>
>> So a new patch added 'eval-and-compile' to all defcustoms:
>
> Will it actually work for a user to customize this? It looks like the
> values are used during compile time, so after changing the value the
> user would have to recompile char-fold.el?
Oh, right. Do you see a problem with a better patch:
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3edc6..6c3f809c2b 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -24,8 +24,43 @@
(eval-and-compile (put 'char-fold-table 'char-table-extra-slots 1))
-(defconst char-fold-table
- (eval-when-compile
+(eval-and-compile (defcustom char-fold-include-base nil
+ "Include mappings from composite character to base letter."
+ :type 'boolean
+ :set (lambda (sym val)
+ (set sym val)
+ (when (boundp 'char-fold-table)
+ (setq char-fold-table (char-fold-make-table))))
+ :group 'matching
+ :version "27.1"))
+
+(eval-and-compile (defcustom char-fold-include-alist
+ '((?\" """ "“" "”" "”" "„" "⹂" "〞" "‟" "‟" "❞" "❝" "❠" "“" "„" "〝" "〟" "🙷"
"🙶" "🙸" "«" "»")
+ (?' "❟" "❛" "❜" "‘" "’" "‚" "‛" "‚" "" "❮" "❯" "‹" "›")
+ (?` "❛" "‘" "‛" "" "❮" "‹"))
+ "Additional character mappings to include."
+ :type '(alist :key-type (character :tag "From")
+ :value-type (repeat (string :tag "To")))
+ :set (lambda (sym val)
+ (set sym val)
+ (when (boundp 'char-fold-table)
+ (setq char-fold-table (char-fold-make-table))))
+ :group 'lisp
+ :version "27.1"))
+
+(eval-and-compile (defcustom char-fold-exclude-alist nil
+ "Character mappings to exclude from default setting."
+ :type '(alist :key-type (character :tag "From")
+ :value-type (character :tag "To"))
+ :set (lambda (sym val)
+ (set sym val)
+ (when (boundp 'char-fold-table)
+ (setq char-fold-table (char-fold-make-table))))
+ :group 'lisp
+ :version "27.1"))
+
+(eval-and-compile
+ (defun char-fold-make-table ()
(let ((equiv (make-char-table 'char-fold-table))
(equiv-multi (make-char-table 'char-fold-table))
(table (unicode-property-table-internal 'decomposition)))
@@ -76,7 +123,11 @@ char-fold-table
(aref equiv-multi (car decomp))))
(aset equiv (car decomp)
(cons (char-to-string char)
- (aref equiv (car decomp))))))))
+ (aref equiv (car decomp))))
+ (when char-fold-include-base
+ (aset equiv char
+ (cons (char-to-string (car decomp))
+ (aref equiv (car decomp)))))))))
(funcall make-decomp-match-char decomp char)
;; Do it again, without the non-spacing characters.
;; This allows 'a' to match 'ä'.
@@ -98,13 +149,18 @@ char-fold-table
table)
;; Add some manual entries.
- (dolist (it '((?\" """ "“" "”" "”" "„" "⹂" "〞" "‟" "‟" "❞" "❝" "❠" "“"
"„" "〝" "〟" "🙷" "🙶" "🙸" "«" "»")
- (?' "❟" "❛" "❜" "‘" "’" "‚" "‛" "‚" "" "❮" "❯" "‹" "›")
- (?` "❛" "‘" "‛" "" "❮" "‹")))
+ (dolist (it char-fold-include-alist)
(let ((idx (car it))
(chars (cdr it)))
(aset equiv idx (append chars (aref equiv idx)))))
+ ;; Remove some entries.
+ (dolist (it char-fold-exclude-alist)
+ (let ((idx (car it))
+ (char (cdr it)))
+ (when (aref equiv idx)
+ (aset equiv idx (remove (char-to-string char) (aref equiv idx))))))
+
;; Convert the lists of characters we compiled into regexps.
(map-char-table
(lambda (char dec-list)
@@ -113,7 +169,11 @@ char-fold-table
(set-char-table-range equiv char re)
(aset equiv char re))))
equiv)
- equiv))
+ equiv)))
+
+(defconst char-fold-table
+ (eval-when-compile
+ (char-fold-make-table))
"Used for folding characters of the same group during search.
This is a char-table with the `char-fold-table' subtype.
- bug#35689: Customizable char-fold, Juri Linkov, 2019/05/11
- bug#35689: Customizable char-fold, Juri Linkov, 2019/05/12
- bug#35689: Customizable char-fold, Noam Postavsky, 2019/05/12
- bug#35689: Customizable char-fold,
Juri Linkov <=
- bug#35689: Customizable char-fold, Noam Postavsky, 2019/05/14
- bug#35689: Customizable char-fold, Eli Zaretskii, 2019/05/14
- bug#35689: Customizable char-fold, Juri Linkov, 2019/05/14
- bug#35689: Customizable char-fold, npostavs, 2019/05/16
- bug#35689: Customizable char-fold, Juri Linkov, 2019/05/16
- bug#35689: Customizable char-fold, Juri Linkov, 2019/05/21
- bug#35689: Customizable char-fold, npostavs, 2019/05/21