USAMI KentaandEli Zaretskii
c68c5fbe14
* lisp/editorconfig-tools.el: * lisp/emacs-lisp/shorthands.el: * lisp/info-xref.el: * lisp/international/quail.el: * lisp/international/rfc1843.el: * lisp/mail/ietf-drums.el: * lisp/mail/rfc2047.el: * lisp/mail/yenc.el: * lisp/net/pop3.el: * lisp/net/sasl-scram-sha256.el: * lisp/net/shr-color.el: * lisp/progmodes/grep.el: * lisp/scroll-bar.el: * lisp/textmodes/emacs-news-mode.el: * lisp/textmodes/reftex-auc.el: * lisp/textmodes/reftex-dcr.el: * lisp/textmodes/reftex-global.el: * lisp/textmodes/reftex-sel.el: * lisp/url/url-dav.el: * lisp/vc/vc-src.el: * lisp/xwidget.el: * lisp/yank-media.el: Remove redundant (require 'cl-lib). (Bug#80129)
83 lines
3.4 KiB
EmacsLisp
83 lines
3.4 KiB
EmacsLisp
;;; shorthands.el --- Read code considering Elisp shorthands -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
|
|
|
|
;; Author: João Távora <joaotavora@gmail.com>
|
|
;; Keywords: lisp
|
|
;; Package: emacs
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Basic helpers for loading files with Shorthands.
|
|
|
|
;;; Code:
|
|
(require 'files)
|
|
(require 'mule)
|
|
|
|
(defun hack-read-symbol-shorthands ()
|
|
"Compute `read-symbol-shorthands' from Local Variables section."
|
|
;; FIXME: relies on the `hack-local-variables--find-variables'
|
|
;; detail of files.el. That function should be exported,
|
|
;; possibly be refactored into two parts, since we're only
|
|
;; interested in basic "Local Variables" parsing.
|
|
;; FIXME: Disable ourselves temporarily to avoid inf-loops during bootstrap,
|
|
;; trying to look for shorthands in the files that implement shorthands.
|
|
(let ((hack-read-symbol-shorthands-function #'ignore))
|
|
(alist-get 'read-symbol-shorthands
|
|
(hack-local-variables--find-variables))))
|
|
|
|
(setq hack-read-symbol-shorthands-function #'hack-read-symbol-shorthands)
|
|
|
|
|
|
;; FIXME: move this all to progmodes/elisp-mode.el? OTOH it'd make
|
|
;; more sense there, OTOH all the elisp font-lock stuff is actually in
|
|
;; lisp/emacs-lisp/lisp-mode.el, which isn't right either. So
|
|
;; shorthand font-locking logic is probably better here for now.
|
|
|
|
(defface elisp-shorthand-font-lock-face
|
|
'((t :inherit font-lock-keyword-face :foreground "cyan"))
|
|
"Face for highlighting shorthands in Emacs Lisp."
|
|
:version "28.1"
|
|
:group 'font-lock-faces)
|
|
|
|
(defun shorthands-font-lock-shorthands (limit)
|
|
"Font lock until LIMIT considering `read-symbol-shorthands'."
|
|
(when read-symbol-shorthands
|
|
(while (re-search-forward
|
|
(concat "\\_<\\(" (rx lisp-mode-symbol) "\\)\\_>")
|
|
limit t)
|
|
(let* ((existing (get-text-property (match-beginning 1) 'face))
|
|
(print-name (match-string 1))
|
|
(probe (and (not (memq existing '(font-lock-comment-face
|
|
font-lock-string-face)))
|
|
(intern-soft print-name)))
|
|
(symbol-name (and probe (symbol-name probe)))
|
|
(prefix (and symbol-name
|
|
(not (string-equal print-name symbol-name))
|
|
(car (assoc print-name
|
|
read-symbol-shorthands
|
|
#'string-prefix-p)))))
|
|
(when prefix
|
|
(add-face-text-property (match-beginning 1)
|
|
(+ (match-beginning 1) (length prefix))
|
|
'elisp-shorthand-font-lock-face))))))
|
|
|
|
(font-lock-add-keywords 'emacs-lisp-mode '((shorthands-font-lock-shorthands)) t)
|
|
|
|
;;; shorthands.el ends here
|