mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-07 15:21:46 +00:00
3d3c109460
Using these variables as "another mechanism for changing face appearance" never really worked, since mode authors were free to use the face instead of the variable (i.e. quoting the symbol). This means that when users customized the variables, it would change its appearance only in some cases, which is a rather surprising interface. Indeed, it turns out that some modes have not always been consistent, and mixed using the variable and the face, increasing the confusion even further. Thus, the only thing users could rely on to always work was to leave the variables at their default value, and to customize the face. We now recommend customizing the face, and are obsoleting these variables. This will lead to some minor code-churn, but it is believed that it will be ultimately worth it. To fix existing Lisp code, you should typically only need to quote the symbol, as this commit shows. It might be the case that we will have to keep the obsolete variables, that have been with us since Emacs 19, around for a longer time-period than normal, to allow package authors to adapt. * lisp/font-lock.el (font-lock-comment-face) (font-lock-comment-delimiter-face, font-lock-string-face) (font-lock-doc-face, font-lock-doc-markup-face, font-lock-keyword-face) (font-lock-builtin-face, font-lock-function-name-face) (font-lock-variable-name-face, font-lock-type-face) (font-lock-constant-face, font-lock-warning-face) (font-lock-negation-char-face, font-lock-preprocessor-face): Make face variables obsolete in favor of customizing the faces directly instead. (Bug#71469) * doc/lispref/modes.texi (Faces for Font Lock): Don't document above obsolete variables. * lisp/cedet/data-debug.el (data-debug-insert-hash-table) (data-debug-insert-widget-properties, data-debug-insert-string) (data-debug-insert-number): * lisp/emacs-lisp/lisp-mode.el (elisp--font-lock-backslash) (lisp-font-lock-syntactic-face-function): * lisp/emacs-lisp/package.el (describe-package-1): * lisp/generic-x.el (rc-generic-mode, rul-generic-mode): * lisp/org/org-table.el (org-table-edit-formulas): * lisp/progmodes/cc-fonts.el (c-font-lock-invalid-single-quotes) (c-maybe-font-lock-wrong-style-comments, c-font-lock-declarators) (c-font-lock-c++-lambda-captures, c-font-lock-c++-modules): * lisp/progmodes/cperl-mode.el (cperl-find-sub-attrs) (cperl-look-at-leading-count, cperl-process-here-doc) (cperl-find-pods-heres): * lisp/progmodes/gdb-mi.el (gdb-init-1, gdb-update, gdb-running) (gdb-starting, gdb-stopped, gdb-internals) (gdb-breakpoints--add-breakpoint-row, gdb-locals-handler-custom) (gdb-registers-handler-custom, gdb-get-source-file): * lisp/progmodes/js.el (js--font-lock-keywords-1) (js--font-lock-keywords-2, js-font-lock-syntactic-face-function): * lisp/progmodes/lua-ts-mode.el (lua-ts--comment-font-lock): * lisp/progmodes/meta-mode.el (meta-indent-in-string-p): * lisp/progmodes/prolog.el (prolog-font-lock-keywords): * lisp/progmodes/python.el (python-font-lock-syntactic-face-function): * lisp/progmodes/ruby-ts-mode.el (ruby-ts--comment-font-lock): * lisp/progmodes/sh-script.el (sh-font-lock-syntactic-face-function): * lisp/textmodes/tex-mode.el (doctex-font-lock-syntactic-face-function): * test/lisp/faces-tests.el (faces--test-color-at-point): * test/lisp/progmodes/cperl-mode-tests.el (cperl-test-extra-delimiters) (cperl-test-bug-47112, cperl-test-bug-65834, cperl-test-bug-66145) (cperl-test-bug-66161, cperl-test-bug-69604): * test/lisp/progmodes/python-tests.el (python-ts-mode-compound-keywords-face) (python-ts-mode-named-assignment-face-1) (python-ts-mode-assignment-face-2, python-ts-mode-nested-types-face-1) (python-ts-mode-union-types-face-1, python-ts-mode-union-types-face-2) (python-ts-mode-types-face-1, python-ts-mode-types-face-2) (python-ts-mode-types-face-3, python-ts-mode-isinstance-type-face-1) (python-ts-mode-isinstance-type-face-2) (python-ts-mode-isinstance-type-face-3) (python-ts-mode-superclass-type-face, python-ts-mode-class-patterns-face) (python-ts-mode-dotted-decorator-face-1) (python-ts-mode-dotted-decorator-face-2) (python-ts-mode-builtin-call-face) (python-ts-mode-interpolation-nested-string) (python-ts-mode-level-fontification-wo-interpolation) (python-ts-mode-disabled-string-interpolation) (python-ts-mode-interpolation-doc-string): * test/lisp/progmodes/ruby-mode-tests.el (ruby-heredoc-font-lock, ruby-heredoc-highlights-interpolations) (ruby-exit!-font-lock, ruby-regexp-interpolation-is-highlighted) (ruby-recognize-symbols-starting-with-at-character) (ruby-hash-character-not-interpolation) (ruby-interpolation-suppresses-quotes-inside) (ruby-interpolation-suppresses-one-double-quote) (ruby-interpolation-inside-percent-literal) (ruby-interpolation-inside-percent-literal-with-paren) (ruby-interpolation-inside-another-interpolation) (ruby-interpolation-inside-double-quoted-percent-literals) (ruby-no-interpolation-in-single-quoted-literals): Don't use above obsolete variables. * lisp/progmodes/cc-fonts.el (font-lock-constant-face): Don't declare now-unused variable.
241 lines
10 KiB
EmacsLisp
241 lines
10 KiB
EmacsLisp
;;; faces-tests.el --- Tests for faces.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2013-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
|
|
;; Keywords:
|
|
|
|
;; 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/>.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'ert-x)
|
|
|
|
(defgroup faces--test nil "Group to test faces."
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test1
|
|
'((t :background "black" :foreground "black"))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test2
|
|
'((t :box 1))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test-extend
|
|
'((t :extend t :background "blue"))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test-no-extend
|
|
'((t :extend nil :background "blue"))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test-inherit-extend
|
|
'((t :inherit (faces--test-extend faces--test2) :background "blue"))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defface faces--test-inherit-no-extend
|
|
'((t :inherit (faces--test2 faces--test-no-extend) :background "blue"))
|
|
""
|
|
:group 'faces--test)
|
|
|
|
(defmacro faces---with-tmp-face (face bg fg &rest body)
|
|
(declare (indent 3))
|
|
`(let ((old-fg (face-foreground ,face))
|
|
(old-bg (face-background ,face)))
|
|
(unwind-protect
|
|
(progn (set-face-foreground ,face ,fg)
|
|
(set-face-background ,face ,bg)
|
|
,@body)
|
|
(set-face-foreground ,face old-fg)
|
|
(set-face-background ,face old-bg))))
|
|
|
|
(ert-deftest faces--test-color-at-point ()
|
|
(with-temp-buffer
|
|
(insert (propertize "STRING" 'face '(faces--test2 faces--test1)))
|
|
(goto-char (point-min))
|
|
(should (equal (background-color-at-point) "black"))
|
|
(should (equal (foreground-color-at-point) "black")))
|
|
(with-temp-buffer
|
|
(insert (propertize "STRING" 'face '(:foreground "black" :background "black")))
|
|
(goto-char (point-min))
|
|
(should (equal (background-color-at-point) "black"))
|
|
(should (equal (foreground-color-at-point) "black")))
|
|
(with-temp-buffer
|
|
(emacs-lisp-mode)
|
|
(faces---with-tmp-face 'font-lock-comment-face "black" "black"
|
|
(faces---with-tmp-face 'font-lock-constant-face "black" "black"
|
|
(insert ";; `symbol'")
|
|
(font-lock-fontify-region (point-min) (point-max))
|
|
(goto-char (point-min))
|
|
(should (equal (background-color-at-point) "black"))
|
|
(should (equal (foreground-color-at-point) "black"))
|
|
(goto-char 6)
|
|
(should (equal (background-color-at-point) "black"))
|
|
(should (equal (foreground-color-at-point) "black"))))))
|
|
|
|
(ert-deftest faces--test-face-id ()
|
|
;; Face ID of 0 is the 'default' face; no face should have the same ID.
|
|
(should (> (face-id 'faces--test1) 0))
|
|
;; 'tooltip' is the last face defined by preloaded packages, so any
|
|
;; face we define in Emacs should have a face ID greater than that,
|
|
;; since the ID of a face is just its index in the array that maps
|
|
;; face IDs to faces.
|
|
(should (> (face-id 'faces--test1) (face-id 'tooltip))))
|
|
|
|
(ert-deftest faces--test-extend ()
|
|
(should (equal (face-attribute 'faces--test-extend :extend) t))
|
|
(should (equal (face-attribute 'faces--test-no-extend :extend) nil))
|
|
(should (equal (face-attribute 'faces--test1 :extend) 'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
)
|
|
|
|
(ert-deftest faces--test-extend-with-themes ()
|
|
(defface spiff-changed-face
|
|
'((t :extend t :weight bold))
|
|
"")
|
|
(defface spiff-added
|
|
'((t :background "grey"))
|
|
"")
|
|
(defface spiff-file-header-face
|
|
'((t :extend nil :foreground "cyan"))
|
|
"")
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) 'unspecified))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(add-to-list 'custom-theme-load-path (ert-resource-directory))
|
|
(load-theme 'faces-test-dark t t)
|
|
(load-theme 'faces-test-light t t)
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) 'unspecified))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(enable-theme 'faces-test-dark)
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) t))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(defface faces--test-face3
|
|
'((t :inherit spiff-added :weight bold))
|
|
"")
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) t))
|
|
(disable-theme 'faces-test-dark)
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) 'unspecified))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) 'unspecified))
|
|
(defface spiff-indicator-changed
|
|
'((t (:weight bold :extend t)))
|
|
"")
|
|
(enable-theme 'faces-test-light)
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) t))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(should (equal (face-attribute 'spiff-indicator-changed :extend) t))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) t))
|
|
(frame-set-background-mode (selected-frame) 'dark)
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend nil t) t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend :extend nil t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend) t))
|
|
(should (equal (face-attribute 'spiff-added :extend) t))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend) nil))
|
|
(should (equal (face-attribute 'spiff-indicator-changed :extend) t))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) t))
|
|
(or noninteractive
|
|
(let ((fr (make-frame)))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend fr)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-extend :extend fr t)
|
|
t))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend
|
|
:extend fr)
|
|
'unspecified))
|
|
(should (equal (face-attribute 'faces--test-inherit-no-extend
|
|
:extend fr t)
|
|
nil))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend fr) t))
|
|
(should (equal (face-attribute 'spiff-added :extend fr) t))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend fr) nil))
|
|
(should (equal (face-attribute 'spiff-indicator-changed :extend fr) t))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) t))
|
|
))
|
|
(disable-theme 'faces-test-light)
|
|
(should (equal (face-attribute 'spiff-indicator-changed :extend) t))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) 'unspecified))
|
|
(or noninteractive
|
|
(let ((fr (make-frame)))
|
|
(should (equal (face-attribute 'spiff-changed-face :extend fr) t))
|
|
(should (equal (face-attribute 'spiff-added :extend fr) 'unspecified))
|
|
(should (equal (face-attribute 'spiff-file-header-face :extend fr) nil))
|
|
(should (equal (face-attribute 'spiff-indicator-changed :extend fr) t))
|
|
(should (equal (face-attribute 'faces--test-face3 :extend nil t) 'unspecified))
|
|
))
|
|
)
|
|
|
|
(ert-deftest test-tty-find-type ()
|
|
(let ((pred (lambda (string)
|
|
(locate-library (concat "term/" string ".el")))))
|
|
(should (tty-find-type pred "cygwin"))
|
|
(should (tty-find-type pred "cygwin-foo"))
|
|
(should (equal (tty-find-type pred "xterm") "xterm"))
|
|
(should (equal (tty-find-type pred "screen.xterm") "screen"))))
|
|
|
|
(provide 'faces-tests)
|
|
;;; faces-tests.el ends here
|