From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 28 Jan 2021 13:43:01 +0000 (-0500)
Subject: Use lexical-binding in lisp/{term,nxml,language}
X-Git-Tag: emacs-28.0.90~4077
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62233c9824047e989cb72c8e2d05e4b4444fe0be;p=emacs.git

Use lexical-binding in lisp/{term,nxml,language}

* test/lisp/electric-tests.el:
* lisp/term/w32console.el:
* lisp/nxml/rng-util.el:
* leim/leim-ext.el: Use lexical-binding.

* lisp/international/titdic-cnv.el (tit-process-header)
(miscdic-convert):
* lisp/international/mule-cmds.el (leim-list-header):
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Use lexical-binding in the generated file.
---

diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index 2378f6fdb4f..687379db9f0 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -1,4 +1,4 @@
-;; leim-ext.el -- extra leim configuration	-*- coding:utf-8; -*-
+;; leim-ext.el -- extra leim configuration	-*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -39,13 +39,13 @@
 (eval-after-load "quail/Punct-b5"
   '(quail-defrule " " ?  nil t))
 
-(register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+"
+(register-input-method "ucs" "UTF-8" #'ucs-input-activate "U+"
 		       "Unicode input as hex in the form Uxxxx.")
 
 (register-input-method
  "korean-hangul"
  "UTF-8"
- 'hangul-input-method-activate
+ #'hangul-input-method-activate
  "한2"
  "Hangul 2-Bulsik Input"
  'hangul2-input-method
@@ -54,7 +54,7 @@
 (register-input-method
  "korean-hangul3f"
  "UTF-8"
- 'hangul-input-method-activate
+ #'hangul-input-method-activate
  "한3f"
  "Hangul 3-Bulsik final Input"
  'hangul3-input-method
@@ -63,7 +63,7 @@
 (register-input-method
  "korean-hangul390"
  "UTF-8"
- 'hangul-input-method-activate
+ #'hangul-input-method-activate
  "한390"
  "Hangul 3-Bulsik 390 Input"
  'hangul390-input-method
@@ -72,7 +72,7 @@
 (register-input-method
  "korean-hangul3"
  "UTF-8"
- 'hangul-input-method-activate
+ #'hangul-input-method-activate
  "한390"
  "Hangul 3-Bulsik 390 Input"
  'hangul390-input-method
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 155c85fb42f..3be7849df19 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -342,7 +342,8 @@ The name of generated file is specified by the variable `ja-dic-filename'."
     (with-current-buffer buf
       (erase-buffer)
       (buffer-disable-undo)
-      (insert ";;; ja-dic.el --- dictionary for Japanese input method\n"
+      (insert ";;; ja-dic.el --- dictionary for Japanese input method"
+	      "  -*- lexical-binding:t -*-\n"
 	      ";;\tGenerated by the command `skkdic-convert'\n"
 	      ";;\tOriginal SKK dictionary file: "
 	      (file-relative-name (expand-file-name filename) dirname)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 347e6782590..8202c3ee27a 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1279,7 +1279,7 @@ in the format of Lisp expression for registering each input method.
 Emacs loads this file at startup time.")
 
 (defconst leim-list-header (format-message
-";;; %s -- list of LEIM (Library of Emacs Input Method) -*-coding: utf-8;-*-
+";;; %s --- list of LEIM (Library of Emacs Input Method)  -*- lexical-binding:t -*-
 ;;
 ;; This file is automatically generated.
 ;;
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 9698d461535..0901115cffe 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -3013,7 +3013,7 @@ of each directory."
 
     ;; At first, clean up the file.
     (with-current-buffer list-buf
-      (goto-char 1)
+      (goto-char (point-min))
 
       ;; Insert the correct header.
       (if (looking-at (regexp-quote leim-list-header))
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index ce5c04293ad..64d66443760 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -269,6 +269,8 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:陰平, 6:陽平, 3:上聲, 4:去聲,
 	(tit-moveleft ",<")
 	(tit-keyprompt nil))
 
+    (princ (format ";;; %s  -*- lexical-binding:t -*-\n"
+                   (file-name-nondirectory filename)))
     (princ ";; Quail package `")
     (princ package)
     (princ "\n")
@@ -1133,6 +1135,8 @@ the generated Quail package is saved."
 	;; Explicitly set eol format to `unix'.
 	(setq coding-system-for-write 'utf-8-unix)
 	(with-temp-file (expand-file-name quailfile dirname)
+          (insert (format ";;; %s  -*- lexical-binding:t -*-\n"
+                          (file-name-nondirectory quailfile)))
 	  (insert (format-message ";; Quail package `%s'\n" name))
 	  (insert (format-message
 		   ";;   Generated by the command `miscdic-convert'\n"))
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 59465c371eb..a20e95086cb 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -1,4 +1,4 @@
-;;; rng-util.el --- utility functions for RELAX NG library
+;;; rng-util.el --- utility functions for RELAX NG library  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc.
 
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index 8859f13bd20..4a925cd84c3 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -1,4 +1,4 @@
-;;; w32console.el -- Setup w32 console keys and colors.
+;;; w32console.el -- Setup w32 console keys and colors.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2007-2021 Free Software Foundation, Inc.
 
diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 1b7beeaa366..05a6989664d 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -1,4 +1,4 @@
-;;; electric-tests.el --- tests for electric.el
+;;; electric-tests.el --- tests for electric.el  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2013-2021 Free Software Foundation, Inc.