diff options
| author | Andrea Corallo | 2021-04-19 18:46:50 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2021-04-19 18:46:50 +0200 |
| commit | b5c76530fab4b99e76249bfb9a105b30bef4ce67 (patch) | |
| tree | 319d7a65b6f818cebed9833534a423fbcb79a9b5 /admin | |
| parent | e54066f3d459f67a1ee4e44552bf0356d010e03f (diff) | |
| parent | 0a4dc70830f5e8286b47120cabc750cca07a75c1 (diff) | |
| download | emacs-b5c76530fab4b99e76249bfb9a105b30bef4ce67.tar.gz emacs-b5c76530fab4b99e76249bfb9a105b30bef4ce67.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/charsets/eucjp-ms.awk | 2 | ||||
| -rw-r--r-- | admin/charsets/mule-charsets.el | 2 | ||||
| -rw-r--r-- | admin/unidata/unidata-gen.el | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk index ca9a317611b..033b37f5ede 100644 --- a/admin/charsets/eucjp-ms.awk +++ b/admin/charsets/eucjp-ms.awk | |||
| @@ -38,7 +38,7 @@ BEGIN { | |||
| 38 | JISX0208_FROM2 = "/xf5/xa1"; | 38 | JISX0208_FROM2 = "/xf5/xa1"; |
| 39 | JISX0212_FROM = "/x8f/xf3/xf3"; | 39 | JISX0212_FROM = "/x8f/xf3/xf3"; |
| 40 | 40 | ||
| 41 | print ";;; eucjp-ms.el -- translation table for eucJP-ms -*- lexical-binding:t -*-"; | 41 | print ";;; eucjp-ms.el --- translation table for eucJP-ms -*- lexical-binding:t -*-"; |
| 42 | print ";;; Automatically generated from /usr/share/i18n/charmaps/EUC-JP-MS.gz"; | 42 | print ";;; Automatically generated from /usr/share/i18n/charmaps/EUC-JP-MS.gz"; |
| 43 | print "(let ((map"; | 43 | print "(let ((map"; |
| 44 | print " '(;JISEXT<->UNICODE"; | 44 | print " '(;JISEXT<->UNICODE"; |
diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el index 99a8c60d880..7bcceb39b23 100644 --- a/admin/charsets/mule-charsets.el +++ b/admin/charsets/mule-charsets.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;; mule-charsets.el -- Generate Mule-original charset maps. -*- lexical-binding: t -*- | 1 | ;;; mule-charsets.el --- Generate Mule-original charset maps. -*- lexical-binding: t -*- |
| 2 | ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 2 | ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 3 | ;; National Institute of Advanced Industrial Science and Technology (AIST) | 3 | ;; National Institute of Advanced Industrial Science and Technology (AIST) |
| 4 | ;; Registration Number H13PRO009 | 4 | ;; Registration Number H13PRO009 |
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 221c9b104e0..abd41e34a48 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;; unidata-gen.el -- Create files containing character property data -*- lexical-binding:t -*- | 1 | ;;; unidata-gen.el --- Create files containing character property data -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2021 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2021 Free Software Foundation, Inc. |
| 4 | 4 | ||
| @@ -1446,7 +1446,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 1446 | ";; no-byte-compile: t\n" | 1446 | ";; no-byte-compile: t\n" |
| 1447 | ";; no-update-autoloads: t\n" | 1447 | ";; no-update-autoloads: t\n" |
| 1448 | ";; End:\n\n" | 1448 | ";; End:\n\n" |
| 1449 | (format ";; %s ends here\n" basename))))) | 1449 | (format ";;; %s ends here\n" basename))))) |
| 1450 | (or noninteractive (message "Generating %s...done" file))) | 1450 | (or noninteractive (message "Generating %s...done" file))) |
| 1451 | 1451 | ||
| 1452 | (defun unidata-gen-charprop (&optional charprop-file) | 1452 | (defun unidata-gen-charprop (&optional charprop-file) |
| @@ -1470,7 +1470,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." | |||
| 1470 | ";; no-byte-compile: t\n" | 1470 | ";; no-byte-compile: t\n" |
| 1471 | ";; no-update-autoloads: t\n" | 1471 | ";; no-update-autoloads: t\n" |
| 1472 | ";; End:\n\n" | 1472 | ";; End:\n\n" |
| 1473 | (format ";; %s ends here\n" | 1473 | (format ";;; %s ends here\n" |
| 1474 | (file-name-nondirectory charprop-file))))) | 1474 | (file-name-nondirectory charprop-file))))) |
| 1475 | 1475 | ||
| 1476 | 1476 | ||