summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Jörg <haj@posteo.de>2020-08-05 15:55:00 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-05 15:55:00 +0200
commit7389a9ef0954d61bf5a85221da7c919aee3451a0 (patch)
treef1374d3dcd9190ec86970b3fd492778ff2be5941
parent9d409746df593a6579bf7fd4d8ecff08e278cdf8 (diff)
downloademacs-7389a9ef0954d61bf5a85221da7c919aee3451a0.tar.gz
cperl-mode: Fix bad parameter construction in cperl-etags
* lisp/progmodes/cperl-mode.el (cperl-etags): This fails with (wrong-type-argument stringp cperl-sub-regexp). The error came with incorporating Jonathan Rockway's work (bug#42355). Copyright-paperwork-exempt: yes
-rw-r--r--lisp/progmodes/cperl-mode.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 6755d10f1ab..6fe0c018b1d 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -6499,9 +6499,10 @@ If optional argument ALL is `recursive', will process Perl files
in subdirectories too."
(interactive)
(let ((cmd "etags")
- (args '("-l" "none" "-r"
+ (args `("-l" "none" "-r"
;; 1=fullname 2=package? 3=name 4=proto? 5=attrs? (VERY APPROX!)
- "/\\<" cperl-sub-regexp "[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/"
+ ,(concat
+ "/\\<" cperl-sub-regexp "[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\(([^()]*)[ \t]*\\)?\\([ \t]*:[^#{;]*\\)?\\([{#]\\|$\\)/\\3/")
"-r"
"/\\<package[ \\t]+\\(\\([a-zA-Z0-9:_]*::\\)?\\([a-zA-Z0-9_]+\\)\\)[ \\t]*\\([#;]\\|$\\)/\\1/"
"-r"