mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Expose some lambdas currently hidden in quoted data

Browse source 
* lisp/language/chinese.el ("Chinese-GB", "Chinese-BIG5")
("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK"):
* lisp/isearch.el (isearch-menu-bar-map):
* lisp/international/mule-cmds.el (language-info-custom-alist):
* lisp/font-lock.el (cpp-font-lock-keywords):
* lisp/cus-start.el (<toplevel>): Expose lambda-expressions to the compiler.
This commit is contained in:
Stefan Monnier 2025-03-24 17:14:26 -04:00
parent c26862a6c9
commit f66c92a793
5 changed files with 50 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lisp/cus-start.el
View file

@ -102,9 +102,9 @@
(word-wrap display boolean) (word-wrap display boolean)
(word-wrap-by-category (word-wrap-by-category
display boolean "28.1" display boolean "28.1"
:set (lambda (symbol value) :set ,(lambda (symbol value)
(set-default symbol value) (set-default symbol value)
(when value (require 'kinsoku)))) (when value (require 'kinsoku))))
(selective-display-ellipses display boolean) (selective-display-ellipses display boolean)
(indicate-empty-lines fringe boolean) (indicate-empty-lines fringe boolean)
(indicate-buffer-boundaries (indicate-buffer-boundaries
@ -157,9 +157,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(cursor-in-non-selected-windows (cursor-in-non-selected-windows
cursor ,cursor-type-types nil cursor ,cursor-type-types nil
:tag "Cursor In Non-selected Windows" :tag "Cursor In Non-selected Windows"
:set (lambda (symbol value) :set ,(lambda (symbol value)
(set-default symbol value) (set-default symbol value)
(force-mode-line-update t))) (force-mode-line-update t)))
(transient-mark-mode editing-basics boolean nil (transient-mark-mode editing-basics boolean nil
:standard (not noninteractive) :standard (not noninteractive)
:initialize custom-initialize-delay :initialize custom-initialize-delay
@ -220,8 +220,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(coding-system (coding-system
:tag "Single coding system" :tag "Single coding system"
:value undecided :value undecided
:match (lambda (widget value) :match ,(lambda (_widget value)
(and value (not (functionp value))))) (and value (not (functionp value)))))
(function :value ignore)))) (function :value ignore))))
;; dired.c ;; dired.c
(completion-ignored-extensions dired (completion-ignored-extensions dired
@ -310,7 +310,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
frames (choice frames (choice
(const :tag "Off" :value nil) (const :tag "Off" :value nil)
(const :tag "On" :value t) (const :tag "On" :value t)
(const :tag "Auto-raise" :value auto-raise)) "26.1") (const :tag "Auto-raise" :value auto-raise))
"26.1")
(yes-or-no-prompt menu string "30.1") (yes-or-no-prompt menu string "30.1")
;; fontset.c ;; fontset.c
;; FIXME nil is the initial value, fontset.el setqs it. ;; FIXME nil is the initial value, fontset.el setqs it.
@ -703,7 +704,8 @@ since it could result in memory overflow and make Emacs crash."
display (choice display (choice
(const :tag "Off" :value nil) (const :tag "Off" :value nil)
(const :tag "Immediate" :value t) (const :tag "Immediate" :value t)
(number :tag "Delay by secs" :value 0.5)) "22.1") (number :tag "Delay by secs" :value 0.5))
"22.1")
(tool-bar-style (tool-bar-style
frames (choice frames (choice
(const :tag "Images" :value image) (const :tag "Images" :value image)
@ -711,18 +713,19 @@ since it could result in memory overflow and make Emacs crash."
(const :tag "Both, text below image" :value both) (const :tag "Both, text below image" :value both)
(const :tag "Both, text to right of image" :value both-horiz) (const :tag "Both, text to right of image" :value both-horiz)
(const :tag "Both, text to left of image" :value text-image-horiz) (const :tag "Both, text to left of image" :value text-image-horiz)
(const :tag "System default" :value nil)) "24.1") (const :tag "System default" :value nil))
"24.1")
(tool-bar-max-label-size frames integer "24.1") (tool-bar-max-label-size frames integer "24.1")
(tab-bar-position (tab-bar-position
tab-bar (choice tab-bar (choice
(const :tag "Tab bar above tool bar" nil) (const :tag "Tab bar above tool bar" nil)
(const :tag "Tab bar below tool bar" t)) (const :tag "Tab bar below tool bar" t))
"27.1" "27.1"
:set (lambda (sym val) :set ,(lambda (sym val)
(set-default sym val) (set-default sym val)
;; Redraw the bars: ;; Redraw the bars:
(tab-bar-mode -1) (tab-bar-mode -1)
(tab-bar-mode 1))) (tab-bar-mode 1)))
(auto-hscroll-mode scrolling (auto-hscroll-mode scrolling
(choice (choice
(const :tag "Don't scroll automatically" (const :tag "Don't scroll automatically"
@ -817,7 +820,7 @@ since it could result in memory overflow and make Emacs crash."
:format "%v") :format "%v")
integer) integer)
"27.1" "27.1"
:safe (lambda (value) (or (booleanp value) (integerp value)))) :safe ,(lambda (value) (or (booleanp value) (integerp value))))
(display-fill-column-indicator-character (display-fill-column-indicator-character
display-fill-column-indicator display-fill-column-indicator
(choice (choice
@ -829,7 +832,7 @@ since it could result in memory overflow and make Emacs crash."
:value nil) :value nil)
character) character)
"27.1" "27.1"
:safe (lambda (value) (or (characterp value) (null value)))) :safe ,(lambda (value) (or (characterp value) (null value))))
(composition-break-at-point display boolean "29.1") (composition-break-at-point display boolean "29.1")
;; xfaces.c ;; xfaces.c
(scalable-fonts-allowed (scalable-fonts-allowed

14
lisp/font-lock.el
View file

@ -2402,16 +2402,16 @@ This should be an integer. Used in `cpp-font-lock-keywords'.")
1 font-lock-string-face prepend) 1 font-lock-string-face prepend)
;; ;;
;; Fontify function macro names. ;; Fontify function macro names.
'("^#[ \t]*define[ \t]+\\([[:alpha:]_][[:alnum:]_$]*\\)(" `("^#[ \t]*define[ \t]+\\([[:alpha:]_][[:alnum:]_$]*\\)("
(1 font-lock-function-name-face prepend) (1 font-lock-function-name-face prepend)
;; ;;
;; Macro arguments. ;; Macro arguments.
((lambda (limit) (,(lambda (limit)
(re-search-forward (re-search-forward
"\\(?:\\([[:alpha:]_][[:alnum:]_]*\\)[,]?\\)" "\\(?:\\([[:alpha:]_][[:alnum:]_]*\\)[,]?\\)"
(or (save-excursion (re-search-forward ")" limit t)) (or (save-excursion (re-search-forward ")" limit t))
limit) limit)
t)) t))
nil nil (1 font-lock-variable-name-face prepend))) nil nil (1 font-lock-variable-name-face prepend)))
;; ;;
;; Fontify symbol names in #elif or #if ... defined preprocessor directives. ;; Fontify symbol names in #elif or #if ... defined preprocessor directives.

10
lisp/international/mule-cmds.el
View file

@ -2022,13 +2022,13 @@ See `set-language-info-alist' for use in programs."
(set-language-info-alist (car elt) (cdr elt))) (set-language-info-alist (car elt) (cdr elt)))
;; re-set the environment in case its parameters changed ;; re-set the environment in case its parameters changed
(set-language-environment current-language-environment))) (set-language-environment current-language-environment)))
:type '(alist :type `(alist
:key-type (string :tag "Language environment" :key-type (string :tag "Language environment"
:completions :completions
(lambda (string pred action) ,(lambda (string pred action)
(let ((completion-ignore-case t)) (let ((completion-ignore-case t))
(complete-with-action (complete-with-action
action language-info-alist string pred)))) action language-info-alist string pred))))
:value-type :value-type
(alist :key-type symbol (alist :key-type symbol
:options ((documentation string) :options ((documentation string)

4
lisp/isearch.el
View file

@ -685,10 +685,10 @@ This is like `describe-bindings', but displays only Isearch keys."
(easy-menu-define isearch-menu-bar-map isearch-mode-map (easy-menu-define isearch-menu-bar-map isearch-mode-map
"Menu for `isearch-mode'." "Menu for `isearch-mode'."
'("Isearch" `("Isearch"
["Cancel search" isearch-cancel ["Cancel search" isearch-cancel
:help "Cancel current search and return to starting point" :help "Cancel current search and return to starting point"
:filter (lambda (binding) :filter ,(lambda (binding)
(if isearch-success 'isearch-abort binding))] (if isearch-success 'isearch-abort binding))]
["Remove characters not found" isearch-abort ["Remove characters not found" isearch-abort
:help "Quit current search" :help "Quit current search"

30
lisp/language/chinese.el
View file

@ -109,11 +109,11 @@
(coding-system-put 'chinese-hz :ascii-compatible-p nil) (coding-system-put 'chinese-hz :ascii-compatible-p nil)
(set-language-info-alist (set-language-info-alist
"Chinese-GB" '((charset chinese-gb2312 chinese-sisheng) "Chinese-GB" `((charset chinese-gb2312 chinese-sisheng)
(iso639-language . zh) (iso639-language . zh)
(cjk-locale-symbol . zh_CN) (cjk-locale-symbol . zh_CN)
(setup-function . (lambda () (setup-function . ,(lambda ()
(use-cjk-char-width-table 'zh_CN))) (use-cjk-char-width-table 'zh_CN)))
(exit-function . use-default-char-width-table) (exit-function . use-default-char-width-table)
(coding-system chinese-iso-8bit iso-2022-cn chinese-hz) (coding-system chinese-iso-8bit iso-2022-cn chinese-hz)
(coding-priority chinese-iso-8bit chinese-gbk chinese-big5 (coding-priority chinese-iso-8bit chinese-gbk chinese-big5
@ -141,11 +141,11 @@
(define-coding-system-alias 'cp950 'chinese-big5) (define-coding-system-alias 'cp950 'chinese-big5)
(set-language-info-alist (set-language-info-alist
"Chinese-BIG5" '((charset chinese-big5-1 chinese-big5-2) "Chinese-BIG5" `((charset chinese-big5-1 chinese-big5-2)
(iso639-language . zh) (iso639-language . zh)
(cjk-locale-symbol . zh_HK) (cjk-locale-symbol . zh_HK)
(setup-function . (lambda () (setup-function . ,(lambda ()
(use-cjk-char-width-table 'zh_HK))) (use-cjk-char-width-table 'zh_HK)))
(exit-function . use-default-char-width-table) (exit-function . use-default-char-width-table)
(coding-system chinese-big5 chinese-iso-7bit) (coding-system chinese-big5 chinese-iso-7bit)
(coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit
@ -195,14 +195,14 @@
(define-coding-system-alias 'euc-taiwan 'euc-tw) (define-coding-system-alias 'euc-taiwan 'euc-tw)
(set-language-info-alist (set-language-info-alist
"Chinese-CNS" '((charset chinese-cns11643-1 chinese-cns11643-2 "Chinese-CNS" `((charset chinese-cns11643-1 chinese-cns11643-2
chinese-cns11643-3 chinese-cns11643-4 chinese-cns11643-3 chinese-cns11643-4
chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-5 chinese-cns11643-6
chinese-cns11643-7) chinese-cns11643-7)
(iso639-language . zh) (iso639-language . zh)
(cjk-locale-symbol . zh_TW) (cjk-locale-symbol . zh_TW)
(setup-function . (lambda () (setup-function . ,(lambda ()
(use-cjk-char-width-table 'zh_TW))) (use-cjk-char-width-table 'zh_TW)))
(exit-function . use-default-char-width-table) (exit-function . use-default-char-width-table)
(coding-system iso-2022-cn euc-tw) (coding-system iso-2022-cn euc-tw)
(coding-priority iso-2022-cn euc-tw chinese-big5 (coding-priority iso-2022-cn euc-tw chinese-big5
@ -216,14 +216,14 @@ accepts Big5 for input also (which is then converted to CNS)."))
'("Chinese")) '("Chinese"))
(set-language-info-alist (set-language-info-alist
"Chinese-EUC-TW" '((charset chinese-cns11643-1 chinese-cns11643-2 "Chinese-EUC-TW" `((charset chinese-cns11643-1 chinese-cns11643-2
chinese-cns11643-3 chinese-cns11643-4 chinese-cns11643-3 chinese-cns11643-4
chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-5 chinese-cns11643-6
chinese-cns11643-7 chinese-big5-1 chinese-big5-2) chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
(iso639-language . zh) (iso639-language . zh)
(cjk-locale-symbol . zh_TW) (cjk-locale-symbol . zh_TW)
(setup-function . (lambda () (setup-function . ,(lambda ()
(use-cjk-char-width-table 'zh_TW))) (use-cjk-char-width-table 'zh_TW)))
(exit-function . use-default-char-width-table) (exit-function . use-default-char-width-table)
(coding-system euc-tw iso-2022-cn) (coding-system euc-tw iso-2022-cn)
(coding-priority euc-tw chinese-big5 iso-2022-cn (coding-priority euc-tw chinese-big5 iso-2022-cn
@ -250,11 +250,11 @@ converted to CNS)."))
(define-coding-system-alias 'windows-936 'chinese-gbk) (define-coding-system-alias 'windows-936 'chinese-gbk)
(set-language-info-alist (set-language-info-alist
"Chinese-GBK" '((charset chinese-gbk) "Chinese-GBK" `((charset chinese-gbk)
(iso639-language . zh) (iso639-language . zh)
(cjk-locale-symbol . zh_CN) (cjk-locale-symbol . zh_CN)
(setup-function . (lambda () (setup-function . ,(lambda ()
(use-cjk-char-width-table 'zh_CN))) (use-cjk-char-width-table 'zh_CN)))
(exit-function . use-default-char-width-table) (exit-function . use-default-char-width-table)
(coding-system chinese-gbk) (coding-system chinese-gbk)
(coding-priority gbk iso-2022-cn chinese-big5 (coding-priority gbk iso-2022-cn chinese-big5