master 7389a9e: cperl-mode: Fix bad parameter construction in cperl-etags

[Lars Ingebrigtsen]

branch: master
commit 7389a9ef0954d61bf5a85221da7c919aee3451a0
Author: Harald Jörg <haj@posteo.de>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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
---
 lisp/progmodes/cperl-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 6755d10..6fe0c01 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"