[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/uni-confusables e1bb697 03/11: * packages/uni-confusabl
From: |
Stefan Monnier |
Subject: |
[elpa] externals/uni-confusables e1bb697 03/11: * packages/uni-confusables/uni-confusables.el: Add ELPA metadata. |
Date: |
Sat, 28 Nov 2020 17:44:58 -0500 (EST) |
branch: externals/uni-confusables
commit e1bb697acb852cf8909bf797c87f145b31f53a89
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* packages/uni-confusables/uni-confusables.el: Add ELPA metadata.
* packages/uni-confusables/uni-confusables-pkg.el: Delete.
* packages/uni-confusables/gen-confusables.el: Use cl-lib.
(gen-confusables-write): Generate a file header that better complies with
the coding conventions (and includes the ELPA metadata).
---
gen-confusables.el | 31 +++++++++++++++++++------------
uni-confusables-pkg.el | 1 -
uni-confusables.el | 8 +++++++-
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/gen-confusables.el b/gen-confusables.el
index b3c2f02..3e17c5e 100644
--- a/gen-confusables.el
+++ b/gen-confusables.el
@@ -1,6 +1,6 @@
;;; gen-confusables.el --- generate uni-confusables.el from confusables.txt
-;; Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2012, 2014 Free Software Foundation, Inc.
;; Author: Teodor Zlatanov <tzz@lifelogs.com>
@@ -21,14 +21,14 @@
;;; Code:
-(require 'cl)
+(require 'cl-lib)
(defvar gen-confusables-char-table-single)
(defvar gen-confusables-char-table-multiple)
(defun gen-confusables-read (file)
(interactive "fConfusables filename: \n")
- (flet ((reader (h) (string-to-number h 16)))
+ (cl-flet ((reader (h) (string-to-number h 16)))
(let ((stable (make-char-table 'confusables-single-script))
(mtable (make-char-table 'confusables-multiple-script))
(count 0)
@@ -44,8 +44,8 @@
(insert-file-contents file)
(goto-char (point-min))
(while (re-search-forward confusable-line-regexp nil t)
- (incf count)
- (when (and (called-interactively-p)
+ (cl-incf count)
+ (when (and (called-interactively-p 'interactive)
(zerop (mod count 100)))
(message "processed %d lines" count))
(let* ((from (match-string 1))
@@ -61,16 +61,21 @@
(interactive "FDumped filename: \n")
(let ((coding-system-for-write 'utf-8-emacs))
(with-temp-file file
- (insert ";; Copyright (C) 1991-2009, 2010 Unicode, Inc.
+ (insert ";;; uni-confusables.el --- Unicode confusables table
+;; Copyright (C) 1991-2009, 2010 Unicode, Inc.
;; This file was generated from the Unicode confusables list at
;; http://www.unicode.org/Public/security/revision-04/confusables.txt.
;; See lisp/international/README in the Emacs trunk
-;; for the copyright and permission notice.\n\n")
+;; for the copyright and permission notice.
+
+;; Version: 0.1
+;; Maintainer: Teodor Zlatanov <tzz@lifelogs.com>
+
+;;; Code:\n\n")
(dolist (type '(single multiple))
(let* ((tablesym (intern (format "uni-confusables-char-table-%s"
type)))
(oursym (intern (format "gen-confusables-char-table-%s" type)))
(ourtable (symbol-value oursym))
- (ourtablename (symbol-name oursym))
(tablename (symbol-name tablesym))
(prop (format "confusables-%s-script" type))
props)
@@ -98,11 +103,13 @@
(nth (* 2 offset) props)
(nth (1+ (* 2 offset)) props))))
(insert ")\n\n")))
+ ;; Use \s escapes in the string, so that this text isn't mis-recognized
+ ;; as applying to this file, but only to the generated file.
(insert "
-;; Local Variables:
-;; coding: utf-8
-;; no-byte-compile: t
-;; End:
+;;\sLocal\sVariables:
+;;\scoding: utf-8
+;;\sno-byte-compile: t
+;;\sEnd:
;; uni-confusables.el ends here"))))
diff --git a/uni-confusables-pkg.el b/uni-confusables-pkg.el
deleted file mode 100644
index 53a0295..0000000
--- a/uni-confusables-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "uni-confusables" "0.1" "Unicode confusables table")
diff --git a/uni-confusables.el b/uni-confusables.el
index b324f46..4224bd9 100644
--- a/uni-confusables.el
+++ b/uni-confusables.el
@@ -1,9 +1,15 @@
+;;; uni-confusables.el --- Unicode confusables table
;; Copyright (C) 1991-2009, 2010 Unicode, Inc.
;; This file was generated from the Unicode confusables list at
;; http://www.unicode.org/Public/security/revision-04/confusables.txt.
;; See lisp/international/README in the Emacs trunk
;; for the copyright and permission notice.
+;; Version: 0.1
+;; Maintainer: Teodor Zlatanov <tzz@lifelogs.com>
+
+;;; Code:
+
(defvar uni-confusables-char-table-single (make-char-table
'confusables-single-script))
(let ((k nil) (v nil) (ranges '(195101 "𪘀" 195100 "鼻" 195099 "鼖" 195098 "鼏"
195097 "鼅" 195096 "黾" 195095 "黹" 195094 "䵖" 195093 "麻" 195092 "𪊑" 195091 "𪈎"
195090 "𪄅" 195089 "䳸" 195088 "𪃎" 195087 "鵧" 195086 "䳭" 195085 "䳎" 195084 "鳽"
195083 "鱀" 195082 "鬒" 195081 "𩬰" 195080 "䯎" 195079 "駾" 195078 "駂" 195077 "馧"
195076 "餩" 195075 "䬳" 195074 "飢" 195073 "𩖶" 195072 "頩" 195071 "頋" 195070 "頋"
195069 "𩒖" 195068 "䪲" 195067 "𩐊" 195066 "韠" 195065 "䩶" 195064 "䩮" 195063 "𩈚"
195062 "𩅅" 195061 "霣" 195060 "嶲 [...]
@@ -74,4 +80,4 @@
;; no-byte-compile: t
;; End:
-;; uni-confusables.el ends here
\ No newline at end of file
+;; uni-confusables.el ends here
- [elpa] branch externals/uni-confusables created (now 4116aeb), Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables 0acb93f 02/11: Clean up copyright notices., Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables e1bb697 03/11: * packages/uni-confusables/uni-confusables.el: Add ELPA metadata.,
Stefan Monnier <=
- [elpa] externals/uni-confusables 1d4fad9 04/11: * packages/uni-confusables/uni-confusables.el: Fix up comment convention., Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables b483e7d 05/11: Update uni-confusables license to only refer to local files, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables 157ab59 06/11: Add provide-statements to ada-ref-man and uni-confusables, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables 09fc8d5 01/11: Remove version numbers in packages/ directory, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables f9e53f5 08/11: Don't put everything on one long line, because that may make Emacs slow, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables c09528a 09/11: Regenerate uni-confusables.el, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables 4116aeb 11/11: * .gitignore: New file, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables 9313758 07/11: Add provide also when generating uni-confusables.el, Stefan Monnier, 2020/11/28
- [elpa] externals/uni-confusables d535475 10/11: Bump uni-confusables version number, Stefan Monnier, 2020/11/28