]> git.eshelyaron.com Git - emacs.git/commitdiff
cperl-mode: Fix bad parameter construction in cperl-etags
authorHarald Jörg <haj@posteo.de>
Wed, 5 Aug 2020 13:55:00 +0000 (15:55 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Wed, 5 Aug 2020 13:55:00 +0000 (15:55 +0200)
* 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

index 6755d10f1abf4f269b5c1b215725a0ada4eccb7d..6fe0c018b1d197c3667a448d8eed95d45a409c9a 100644 (file)
@@ -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"