aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2023-10-26 21:09:06 +0200
committerStefan Kangas2023-10-26 21:09:06 +0200
commit2ec90ac8ffc3075efc55c7a3f1d2e5e62d895d36 (patch)
tree37fd8da232ad9b8e516092b9e2710947730ec235
parent3d72fb13a8a6f30e2a0079abbf8a96aae6819b06 (diff)
downloademacs-2ec90ac8ffc3075efc55c7a3f1d2e5e62d895d36.tar.gz
emacs-2ec90ac8ffc3075efc55c7a3f1d2e5e62d895d36.zip
Remove highlighting trailing whitespace from cperl-mode
* lisp/progmodes/cperl-mode.el (cperl-invalid-face): Make obsolete in favor of 'show-trailing-whitespace'. (cperl-init-faces): No longer highlight trailing whitespace separately. (cperl-praise, cperl-tips-faces): Update documentation for above change.
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/progmodes/cperl-mode.el7
2 files changed, 6 insertions, 5 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 3ad886bdc2b..05fd1b7a390 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -876,6 +876,10 @@ The Perl documentation in info format is no longer distributed with
876Perl or on CPAN since more than 10 years. Perl documentation can be 876Perl or on CPAN since more than 10 years. Perl documentation can be
877read with 'cperl-perldoc' instead. 877read with 'cperl-perldoc' instead.
878 878
879*** Highlighting trailing whitespace has been removed.
880The user option 'cperl-invalid-face' is now obsolete, and does
881nothing. See the user option 'show-trailing-whitespace' instead.
882
879** Emacs Sessions (Desktop) 883** Emacs Sessions (Desktop)
880 884
881+++ 885+++
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 2894f36477a..85495732075 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -379,6 +379,8 @@ Font for POD headers."
379 :type 'face 379 :type 'face
380 :version "21.1" 380 :version "21.1"
381 :group 'cperl-faces) 381 :group 'cperl-faces)
382(make-obsolete-variable 'cperl-invalid-face
383 'show-trailing-whitespace "30.1")
382 384
383(defcustom cperl-pod-here-fontify t 385(defcustom cperl-pod-here-fontify t
384 "Not-nil after evaluation means to highlight POD and here-docs sections." 386 "Not-nil after evaluation means to highlight POD and here-docs sections."
@@ -730,7 +732,6 @@ voice);
730 732
731 m) Highlights (by user-choice) either 3-delimiters constructs 733 m) Highlights (by user-choice) either 3-delimiters constructs
732 (such as tr/a/b/), or regular expressions and `y/tr'; 734 (such as tr/a/b/), or regular expressions and `y/tr';
733 n) Highlights trailing whitespace;
734 o) Is able to manipulate Perl Regular Expressions to ease 735 o) Is able to manipulate Perl Regular Expressions to ease
735 conversion to a more readable form. 736 conversion to a more readable form.
736 p) Can ispell POD sections and HERE-DOCs. 737 p) Can ispell POD sections and HERE-DOCs.
@@ -828,7 +829,6 @@ B) Speed of editing operations.
828 `font-lock-type-face' Overridable keywords 829 `font-lock-type-face' Overridable keywords
829 `font-lock-variable-name-face' Variable declarations, indirect array and 830 `font-lock-variable-name-face' Variable declarations, indirect array and
830 hash names, POD headers/item names 831 hash names, POD headers/item names
831 `cperl-invalid-face' Trailing whitespace
832 832
833Note that in several situations the highlighting tries to inform about 833Note that in several situations the highlighting tries to inform about
834possible confusion, such as different colors for function names in 834possible confusion, such as different colors for function names in
@@ -5858,9 +5858,6 @@ functions (which they are not). Inherits from `default'.")
5858 (setq 5858 (setq
5859 t-font-lock-keywords 5859 t-font-lock-keywords
5860 (list 5860 (list
5861 ;; -------- trailing spaces -> use invalid-face as a warning
5862 ;; (matcher subexp facespec)
5863 `("[ \t]+$" 0 ',cperl-invalid-face t)
5864 ;; -------- function definition _and_ declaration 5861 ;; -------- function definition _and_ declaration
5865 ;; (matcher (subexp facespec)) 5862 ;; (matcher (subexp facespec))
5866 ;; facespec is evaluated depending on whether the 5863 ;; facespec is evaluated depending on whether the