GNU bug report logs -
#35689
Customizable char-fold
Previous Next
Reported by: Juri Linkov <juri <at> linkov.net>
Date: Sat, 11 May 2019 21:32:01 UTC
Severity: wishlist
Tags: fixed, patch
Fixed in version 27.0.50
Done: Juri Linkov <juri <at> linkov.net>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your bug report
#35689: Customizable char-fold
which was filed against the emacs package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 35689 <at> debbugs.gnu.org.
--
35689: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=35689
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
Thanks to everyone who helped! Pushed to master as 376f5df3cc.
[Message part 3 (message/rfc822, inline)]
[Message part 4 (text/plain, inline)]
Tags: patch
This patch adds long-awaited customization to char-fold.el:
[char-fold-defcustom.patch (text/x-diff, inline)]
diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index e61bc3edc6..24882008a4 100644
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -24,6 +24,30 @@
(eval-and-compile (put 'char-fold-table 'char-table-extra-slots 1))
+(defcustom char-fold-include-base nil
+ "Include mappings from composite character to base letter."
+ :type 'boolean
+ :group 'matching
+ :version "27.1")
+
+(defcustom char-fold-include-alist
+ '((?\" """ "“" "”" "”" "„" "⹂" "〞" "‟" "‟" "❞" "❝" "❠" "“" "„" "〝" "〟" "🙷" "🙶" "🙸" "«" "»")
+ (?' "❟" "❛" "❜" "‘" "’" "‚" "‛" "‚" "" "❮" "❯" "‹" "›")
+ (?` "❛" "‘" "‛" "" "❮" "‹"))
+ "Additional character mappings to include."
+ :type '(alist :key-type (character :tag "From")
+ :value-type (repeat (string :tag "To")))
+ :group 'lisp
+ :version "27.1")
+
+(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"))
+ :group 'lisp
+ :version "27.1")
+
+
(defconst char-fold-table
(eval-when-compile
(let ((equiv (make-char-table 'char-fold-table))
@@ -76,7 +106,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 +132,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)
This bug report was last modified 5 years and 295 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.