Use lexical-binding in the remaining preloaded files

* lisp/widget.el:
* lisp/w32-fns.el:
* lisp/textmodes/fill.el:
* lisp/term/common-win.el:
* lisp/scroll-bar.el:
* lisp/rfn-eshadow.el:
* lisp/menu-bar.el:
* lisp/language/tibetan.el:
* lisp/language/thai.el:
* lisp/language/misc-lang.el:
* lisp/language/lao.el:
* lisp/language/korean.el:
* lisp/language/japanese.el:
* lisp/language/indian.el:
* lisp/language/hebrew.el:
* lisp/language/european.el:
* lisp/language/ethiopic.el:
* lisp/language/english.el:
* lisp/language/cyrillic.el:
* lisp/language/chinese.el:
* lisp/jka-cmpr-hook.el:
* lisp/international/ucs-normalize.el:
* lisp/international/mule.el:
* lisp/international/mule-conf.el:
* lisp/international/iso-transl.el:
* lisp/international/fontset.el:
* lisp/international/characters.el:
* lisp/format.el:
* lisp/facemenu.el:
* lisp/electric.el:
* lisp/dos-w32.el:
* lisp/dos-fns.el:
* lisp/disp-table.el:
* lisp/cus-face.el:
* lisp/composite.el:
* lisp/bindings.el:
* admin/unidata/blocks.awk:
* admin/charsets/eucjp-ms.awk:
* admin/charsets/cp51932.awk: Use `lexical-binding`.
This commit is contained in:
Stefan Monnier 2021-01-04 20:57:42 -05:00
parent 80e2647220
commit 898a94a9be
41 changed files with 73 additions and 77 deletions

View file

@ -31,7 +31,7 @@
# already been mapped to 1 or 3.
BEGIN {
print ";;; cp51932.el -- translation table for CP51932";
print ";;; cp51932.el -- translation table for CP51932 -*- lexical-binding:t -*-";
print ";;; Automatically generated from CP932-2BYTE.map";
print "(let ((map";
printf " '(;JISEXT<->UNICODE";

View file

@ -38,7 +38,7 @@ BEGIN {
JISX0208_FROM2 = "/xf5/xa1";
JISX0212_FROM = "/x8f/xf3/xf3";
print ";;; eucjp-ms.el -- translation table for eucJP-ms";
print ";;; eucjp-ms.el -- translation table for eucJP-ms -*- lexical-binding:t -*-";
print ";;; Automatically generated from /usr/share/i18n/charmaps/EUC-JP-MS.gz";
print "(let ((map";
print " '(;JISEXT<->UNICODE";

View file

@ -203,7 +203,7 @@ function name2alias(name , w, w2) {
}
END {
print ";;; charscript.el --- character script table"
print ";;; charscript.el --- character script table -*- lexical-binding:t -*-"
print ";;; Automatically generated from admin/unidata/Blocks.txt"
print "(let (script-list)"
print " (dolist (elt '("

View file

@ -1,4 +1,4 @@
;;; bindings.el --- define standard key bindings and some variables
;;; bindings.el --- define standard key bindings and some variables -*- lexical-binding: t; -*-
;; Copyright (C) 1985-1987, 1992-1996, 1999-2021 Free Software
;; Foundation, Inc.
@ -856,7 +856,7 @@ in contrast with \\[forward-char] and \\[backward-char], which
see."
(interactive "^p")
(if visual-order-cursor-movement
(dotimes (i (if (numberp n) (abs n) 1))
(dotimes (_ (if (numberp n) (abs n) 1))
(move-point-visually (if (and (numberp n) (< n 0)) -1 1)))
(if (eq (current-bidi-paragraph-direction) 'left-to-right)
(forward-char n)
@ -874,7 +874,7 @@ in contrast with \\[forward-char] and \\[backward-char], which
see."
(interactive "^p")
(if visual-order-cursor-movement
(dotimes (i (if (numberp n) (abs n) 1))
(dotimes (_ (if (numberp n) (abs n) 1))
(move-point-visually (if (and (numberp n) (< n 0)) 1 -1)))
(if (eq (current-bidi-paragraph-direction) 'left-to-right)
(backward-char n)

View file

@ -1,4 +1,4 @@
;;; composite.el --- support character composition
;;; composite.el --- support character composition -*- lexical-binding: t; -*-
;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
@ -593,7 +593,6 @@ All non-spacing characters have this function in
(as (lglyph-ascent glyph))
(de (lglyph-descent glyph))
(ce (/ (+ lb rb) 2))
(w (lglyph-width glyph))
xoff yoff)
(cond
((and class (>= class 200) (<= class 240))
@ -653,7 +652,8 @@ All non-spacing characters have this function in
((and (= class 0)
(eq (get-char-code-property (lglyph-char glyph)
;; Me = enclosing mark
'general-category) 'Me))
'general-category)
'Me))
;; Artificially laying out glyphs in an enclosing
;; mark is difficult. All we can do is to adjust
;; the x-offset and width of the base glyph to
@ -695,9 +695,7 @@ All non-spacing characters have this function in
(defun compose-gstring-for-dotted-circle (gstring direction)
(let* ((dc (lgstring-glyph gstring 0)) ; glyph of dotted-circle
(dc-id (lglyph-code dc))
(fc (lgstring-glyph gstring 1)) ; glyph of the following char
(fc-id (lglyph-code fc))
(gstr (and nil (font-shape-gstring gstring direction))))
(if (and gstr
(or (= (lgstring-glyph-len gstr) 1)

View file

@ -1,4 +1,4 @@
;;; cus-face.el --- customization support for faces
;;; cus-face.el --- customization support for faces -*- lexical-binding: t; -*-
;;
;; Copyright (C) 1996-1997, 1999-2021 Free Software Foundation, Inc.
;;

View file

@ -1,4 +1,4 @@
;;; disp-table.el --- functions for dealing with char tables
;;; disp-table.el --- functions for dealing with char tables -*- lexical-binding: t; -*-
;; Copyright (C) 1987, 1994-1995, 1999, 2001-2021 Free Software
;; Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; dos-fns.el --- MS-Dos specific functions
;;; dos-fns.el --- MS-Dos specific functions -*- lexical-binding: t; -*-
;; Copyright (C) 1991, 1993, 1995-1996, 2001-2021 Free Software
;; Foundation, Inc.

View file

@ -1,4 +1,4 @@
;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms -*- lexical-binding: t; -*-
;; Copyright (C) 1996, 2001-2021 Free Software Foundation, Inc.
@ -154,13 +154,15 @@ when writing the file."
;; FIXME: Can't we use find-file-literally for the same purposes?
(interactive "FFind file binary: ")
(let ((coding-system-for-read 'no-conversion)) ;; FIXME: undecided-unix?
(find-file filename)))
(with-suppressed-warnings ((interactive-only find-file))
(find-file filename))))
(defun find-file-text (filename)
"Visit file FILENAME and treat it as a text file."
(interactive "FFind file text: ")
(let ((coding-system-for-read 'undecided-dos))
(find-file filename)))
(with-suppressed-warnings ((interactive-only find-file))
(find-file filename))))
(defun w32-find-file-not-found-set-buffer-file-coding-system ()
(with-current-buffer (current-buffer)
@ -261,6 +263,8 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
:group 'dos-fns
:group 'w32)
(defvar w32-quote-process-args)
;; Function to actually send data to the printer port.
;; Supports writing directly, and using various programs.
(defun w32-direct-print-region-helper (printer

View file

@ -1,4 +1,4 @@
;;; electric.el --- window maker and Command loop for `electric' modes
;;; electric.el --- window maker and Command loop for `electric' modes -*- lexical-binding: t; -*-
;; Copyright (C) 1985-1986, 1995, 2001-2021 Free Software Foundation,
;; Inc.
@ -385,6 +385,8 @@ If multiple rules match, only first one is executed.")
(when electric-layout-mode
(electric-layout-post-self-insert-function-1)))
(defvar electric-pair-open-newline-between-pairs)
;; for edebug's sake, a separate function
(defun electric-layout-post-self-insert-function-1 ()
(let* ((pos (electric--after-char-pos))

View file

@ -1,4 +1,4 @@
;;; facemenu.el --- create a face menu for interactively adding fonts to text
;;; facemenu.el --- create a face menu for interactively adding fonts to text -*- lexical-binding: t; -*-
;; Copyright (C) 1994-1996, 2001-2021 Free Software Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; font-core.el --- Core interface to font-lock
;;; font-core.el --- Core interface to font-lock -*- lexical-binding: t; -*-
;; Copyright (C) 1992-2021 Free Software Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; format.el --- read and save files in multiple formats
;;; format.el --- read and save files in multiple formats -*- lexical-binding: t; -*-
;; Copyright (C) 1994-1995, 1997, 1999, 2001-2021 Free Software
;; Foundation, Inc.
@ -419,7 +419,8 @@ If FORMAT is nil then do not do any format conversion."
(file-name-nondirectory file)))))
(list file fmt)))
(let ((format-alist nil))
(find-file filename))
(with-suppressed-warnings ((interactive-only find-file))
(find-file filename)))
(if format
(format-decode-buffer format)))

View file

@ -1,4 +1,4 @@
;;; characters.el --- set syntax and category for multibyte characters
;;; characters.el --- set syntax and category for multibyte characters -*- lexical-binding: t; -*-
;; Copyright (C) 1997, 2000-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; fontset.el --- commands for handling fontset
;;; fontset.el --- commands for handling fontset -*- lexical-binding: t; -*-
;; Copyright (C) 1997-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; iso-transl.el --- keyboard input for ISO 10646 chars -*- coding: utf-8 -*-
;;; iso-transl.el --- keyboard input for ISO 10646 chars -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1987, 1993-1999, 2001-2021 Free Software Foundation,
;; Inc.

View file

@ -1,4 +1,4 @@
;;; mule-conf.el --- configure multilingual environment
;;; mule-conf.el --- configure multilingual environment -*- lexical-binding: t; -*-
;; Copyright (C) 1997-2021 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

View file

@ -1,4 +1,4 @@
;;; mule.el --- basic commands for multilingual environment
;;; mule.el --- basic commands for multilingual environment -*- lexical-binding: t; -*-
;; Copyright (C) 1997-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; ucs-normalize.el --- Unicode normalization NFC/NFD/NFKD/NFKC
;;; ucs-normalize.el --- Unicode normalization NFC/NFD/NFKD/NFKC -*- lexical-binding: t; -*-
;; Copyright (C) 2009-2021 Free Software Foundation, Inc.
@ -185,7 +185,7 @@
;; always returns nil, something the code here doesn't like.
(define-char-code-property 'decomposition "uni-decomposition.el")
(define-char-code-property 'canonical-combining-class "uni-combining.el")
(let ((char 0) ccc decomposition)
(let (ccc decomposition)
(mapc
(lambda (start-end)
(cl-do ((char (car start-end) (+ char 1))) ((> char (cdr start-end)))

View file

@ -1,4 +1,4 @@
;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el -*- lexical-binding: t; -*-
;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2021 Free Software
;; Foundation, Inc.
@ -93,6 +93,7 @@ Otherwise, it is nil.")
"\\)" file-name-version-regexp "?\\'"))))
;; Functions for accessing the return value of jka-compr-get-compression-info
;; FIXME: Use cl-defstruct!
(defun jka-compr-info-regexp (info) (aref info 0))
(defun jka-compr-info-compress-message (info) (aref info 1))
(defun jka-compr-info-compress-program (info) (aref info 2))

View file

@ -1,4 +1,4 @@
;;; chinese.el --- support for Chinese -*- coding: utf-8; -*-
;;; chinese.el --- support for Chinese -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; cyrillic.el --- support for Cyrillic -*- coding: utf-8; -*-
;;; cyrillic.el --- support for Cyrillic -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1997-1998, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; english.el --- support for English
;;; english.el --- support for English -*- lexical-binding: t; -*-
;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

View file

@ -1,4 +1,4 @@
;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*-
;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; lexical-binding: t; -*-
;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; european.el --- support for European languages -*- coding: utf-8; -*-
;;; european.el --- support for European languages -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; hebrew.el --- support for Hebrew -*- coding: utf-8 -*-
;;; hebrew.el --- support for Hebrew -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; indian.el --- Indian languages support -*- coding: utf-8; -*-
;;; indian.el --- Indian languages support -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1997, 1999, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

View file

@ -1,4 +1,4 @@
;;; japanese.el --- support for Japanese
;;; japanese.el --- support for Japanese -*- lexical-binding: t; -*-
;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; korean.el --- support for Korean -*- coding: utf-8 -*-
;;; korean.el --- support for Korean -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; lao.el --- support for Lao -*- coding: utf-8 -*-
;;; lao.el --- support for Lao -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

View file

@ -1,4 +1,4 @@
;;; misc-lang.el --- support for miscellaneous languages (characters)
;;; misc-lang.el --- support for miscellaneous languages (characters) -*- lexical-binding: t; -*-
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011

View file

@ -1,4 +1,4 @@
;;; thai.el --- support for Thai -*- coding: utf-8 -*-
;;; thai.el --- support for Thai -*- coding: utf-8; lexical-binding: t; -*-
;; Copyright (C) 1997-1998, 2000-2021 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

View file

@ -1,4 +1,4 @@
;;; tibetan.el --- support for Tibetan language -*- coding: utf-8-emacs; -*-
;;; tibetan.el --- support for Tibetan language -*- coding: utf-8-emacs; lexical-binding: t; -*-
;; Copyright (C) 1997, 2001-2021 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,

View file

@ -1,4 +1,4 @@
;;; menu-bar.el --- define a default menu bar
;;; menu-bar.el --- define a default menu bar -*- lexical-binding: t; -*-
;; Copyright (C) 1993-1995, 2000-2021 Free Software Foundation, Inc.
@ -229,7 +229,8 @@
(filename (car (find-file-read-args "Find file: " mustmatch))))
(if mustmatch
(find-file-existing filename)
(find-file filename))))
(with-suppressed-warnings ((interactive-only find-file))
(find-file filename)))))
;; The "Edit->Search" submenu
(defvar menu-bar-last-search-type nil

View file

@ -1,4 +1,4 @@
;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text
;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text -*- lexical-binding: t; -*-
;;
;; Copyright (C) 2000-2021 Free Software Foundation, Inc.
;;

View file

@ -1,4 +1,4 @@
;;; scroll-bar.el --- window system-independent scroll bar support
;;; scroll-bar.el --- window system-independent scroll bar support -*- lexical-binding: t; -*-
;; Copyright (C) 1993-1995, 1999-2021 Free Software Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; common-win.el --- common part of handling window systems
;;; common-win.el --- common part of handling window systems -*- lexical-binding: t; -*-
;; Copyright (C) 1993-1994, 2001-2021 Free Software Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; tty-colors.el --- color support for character terminals
;;; tty-colors.el --- color support for character terminals -*- lexical-binding: t; -*-
;; Copyright (C) 1999-2021 Free Software Foundation, Inc.

View file

@ -1,4 +1,4 @@
;;; fill.el --- fill commands for Emacs
;;; fill.el --- fill commands for Emacs -*- lexical-binding: t; -*-
;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2021 Free
;; Software Foundation, Inc.
@ -40,13 +40,11 @@ Non-nil means changing indent doesn't end a paragraph.
That mode can handle paragraphs with extra indentation on the first line,
but it requires separator lines between paragraphs.
A value of nil means that any change in indentation starts a new paragraph."
:type 'boolean
:group 'fill)
:type 'boolean)
(defcustom colon-double-space nil
"Non-nil means put two spaces after a colon when filling."
:type 'boolean
:group 'fill)
:type 'boolean)
(put 'colon-double-space 'safe-local-variable 'booleanp)
(defcustom fill-separate-heterogeneous-words-with-space nil
@ -56,7 +54,6 @@ the beginning of the next line when concatenating them for
filling those lines. Whether to use a space depends on how the
words are categorized."
:type 'boolean
:group 'fill
:version "26.1")
(defvar fill-paragraph-function nil
@ -75,8 +72,7 @@ such as `fill-forward-paragraph-function'.")
Kinsoku processing is designed to prevent certain characters from being
placed at the beginning or end of a line by filling.
See the documentation of `kinsoku' for more information."
:type 'boolean
:group 'fill)
:type 'boolean)
(defun set-fill-prefix ()
"Set the fill prefix to the current line up to point.
@ -96,8 +92,7 @@ reinserts the fill prefix in each resulting line."
(defcustom adaptive-fill-mode t
"Non-nil means determine a paragraph's fill prefix from its text."
:type 'boolean
:group 'fill)
:type 'boolean)
(defcustom adaptive-fill-regexp
;; Added `!' for doxygen comments starting with `//!' or `/*!'.
@ -113,8 +108,7 @@ standard indentation for the whole paragraph.
If the paragraph has just one line, the indentation is taken from that
line, but in that case `adaptive-fill-first-line-regexp' also plays
a role."
:type 'regexp
:group 'fill)
:type 'regexp)
(defcustom adaptive-fill-first-line-regexp (purecopy "\\`[ \t]*\\'")
"Regexp specifying whether to set fill prefix from a one-line paragraph.
@ -126,15 +120,13 @@ By default, this regexp matches sequences of just spaces and tabs.
However, we never use a prefix from a one-line paragraph
if it would act as a paragraph-starter on the second line."
:type 'regexp
:group 'fill)
:type 'regexp)
(defcustom adaptive-fill-function #'ignore
"Function to call to choose a fill prefix for a paragraph.
A nil return value means the function has not determined the fill prefix."
:version "27.1"
:type 'function
:group 'fill)
:type 'function)
(defvar fill-indent-according-to-mode nil ;Screws up CC-mode's filling tricks.
"Whether or not filling should try to use the major mode's indentation.")
@ -367,15 +359,13 @@ which is an error according to some typographical conventions."
The predicates are called with no arguments, with point at the place to
be tested. If it returns a non-nil value, fill commands do not break
the line there."
:group 'fill
:type 'hook
:options '(fill-french-nobreak-p fill-single-word-nobreak-p
fill-single-char-nobreak-p))
(defcustom fill-nobreak-invisible nil
"Non-nil means that fill commands do not break lines in invisible text."
:type 'boolean
:group 'fill)
:type 'boolean)
(defun fill-nobreak-p ()
"Return nil if breaking the line at point is allowed.
@ -1110,8 +1100,7 @@ The `justification' text-property can locally override this variable."
(const full)
(const center)
(const none))
:safe 'symbolp
:group 'fill)
:safe 'symbolp)
(make-variable-buffer-local 'default-justification)
(defun current-justification ()

View file

@ -1,4 +1,4 @@
;;; w32-fns.el --- Lisp routines for 32-bit Windows
;;; w32-fns.el --- Lisp routines for 32-bit Windows -*- lexical-binding: t; -*-
;; Copyright (C) 1994, 2001-2021 Free Software Foundation, Inc.
@ -383,10 +383,10 @@ for any permissions.
This is required because the Windows build environment is not required
to include Sed, which is used by leim/Makefile.in to do the job."
(find-file orig)
(goto-char (point-max))
(insert-file-contents extra)
(delete-matching-lines "^$\\|^;")
(save-buffers-kill-emacs t))
(with-current-buffer (find-file-noselect orig)
(goto-char (point-max))
(insert-file-contents extra)
(delete-matching-lines "^$\\|^;")
(save-buffers-kill-emacs t)))
;;; w32-fns.el ends here

View file

@ -1,4 +1,4 @@
;;; widget.el --- a library of user interface components
;;; widget.el --- a library of user interface components -*- lexical-binding: t; -*-
;;
;; Copyright (C) 1996-1997, 2001-2021 Free Software Foundation, Inc.
;;