mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Code Issues Projects Releases Wiki Activity

; cperl-mode: Eliminate fallbacks if font-lock isn't loaded

Browse source 
* lisp/progmodes/cperl-mode.el (cperl-find-pods-heres):
Eliminate conditionals which always evaluate to true if
font-lock is preloaded (since Emacs 22.1).  (Bug#45183)
This commit is contained in:
Harald Jörg 2020-12-11 17:48:30 +01:00 • committed by Stefan Kangas
parent b04f322a9b
commit dc5e875930
1 changed files with 7 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

45
lisp/progmodes/cperl-mode.el
View file

@ -3473,49 +3473,18 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
(font-lock-string-face (if (boundp 'font-lock-string-face)
font-lock-string-face
'font-lock-string-face))
(my-cperl-delimiters-face (if (boundp 'font-lock-constant-face)
font-lock-constant-face
'font-lock-constant-face))
(my-cperl-delimiters-face
font-lock-constant-face)
(my-cperl-REx-spec-char-face ; [] ^.$ and wrapper-of ({})
(if (boundp 'font-lock-function-name-face)
font-lock-function-name-face
'font-lock-function-name-face))
(font-lock-variable-name-face ; interpolated vars and ({})-code
(if (boundp 'font-lock-variable-name-face)
font-lock-variable-name-face
'font-lock-variable-name-face))
(font-lock-function-name-face ; used in `cperl-find-sub-attrs'
(if (boundp 'font-lock-function-name-face)
font-lock-function-name-face
'font-lock-function-name-face))
(font-lock-constant-face ; used in `cperl-find-sub-attrs'
(if (boundp 'font-lock-constant-face)
font-lock-constant-face
'font-lock-constant-face))
font-lock-function-name-face)
(my-cperl-REx-0length-face ; 0-length, (?:)etc, non-literal \
(if (boundp 'font-lock-builtin-face)
font-lock-builtin-face
'font-lock-builtin-face))
(font-lock-comment-face
(if (boundp 'font-lock-comment-face)
font-lock-comment-face
'font-lock-comment-face))
(font-lock-warning-face
(if (boundp 'font-lock-warning-face)
font-lock-warning-face
'font-lock-warning-face))
font-lock-builtin-face)
(my-cperl-REx-ctl-face ; (|)
(if (boundp 'font-lock-keyword-face)
font-lock-keyword-face
'font-lock-keyword-face))
font-lock-keyword-face)
(my-cperl-REx-modifiers-face ; //gims
(if (boundp 'cperl-nonoverridable-face)
cperl-nonoverridable-face
'cperl-nonoverridable-face))
'cperl-nonoverridable-face)
(my-cperl-REx-length1-face ; length=1 escaped chars, POSIX classes
(if (boundp 'font-lock-type-face)
font-lock-type-face
'font-lock-type-face))
font-lock-type-face)
(stop-point (if ignore-max
(point-max)
max))