From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Ola Nilsson Newsgroups: gmane.emacs.bugs Subject: bug#36317: [PATCH] Correct the name part of defun-prompt-regex in sh-script-mode Date: Fri, 21 Jun 2019 01:01:22 +0200 Message-ID: <20190620230122.22553-1-ola.nilsson@gmail.com> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="190781"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Ola Nilsson To: 36317@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 21 01:18:27 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1he6K1-000nSO-Ls for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 Jun 2019 01:18:25 +0200 Original-Received: from localhost ([::1]:53524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he6K0-0000Bd-Dq for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 Jun 2019 19:18:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50739) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he6Jf-0000BP-Ch for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:18:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1he6Je-0000ft-AN for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:18:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1he6Je-0000fW-4E for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1he6Jd-0002uf-SM for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:18:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ola Nilsson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Jun 2019 23:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36317 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.156107266711169 (code B ref -1); Thu, 20 Jun 2019 23:18:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Jun 2019 23:17:47 +0000 Original-Received: from localhost ([127.0.0.1]:49415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1he6JP-0002u5-CY for submit@debbugs.gnu.org; Thu, 20 Jun 2019 19:17:47 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:42093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1he6JM-0002tx-NK for submit@debbugs.gnu.org; Thu, 20 Jun 2019 19:17:46 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50484) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he6JK-0000A7-K9 for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:17:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1he642-00045S-0H for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:01:56 -0400 Original-Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:40380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1he63s-00041l-RK for bug-gnu-emacs@gnu.org; Thu, 20 Jun 2019 19:01:47 -0400 Original-Received: by mail-lj1-x241.google.com with SMTP id a21so4221878ljh.7 for ; Thu, 20 Jun 2019 16:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=U1vhVEgs1+th3BOpaR2/7AunLyFVfwbl7IStUqFFTMU=; b=C4mWQsBHe6JsMTquIsR/eGspCK0ZaFYijyiGhflEH+GufER+AQQee9fwT8iUyMqMrV 69ZmiVul3h1RTzK3L7uOT51Iq9WDJLXYv+SobZbbk+O4O6W+vZmCIn5SUpwSAA30rxu5 INT+Cjobb8Y4ZghJj+i/rw5a9m8Vk2kj7V6VzgYR0+u77dndvUGjT6AIm+whhhx/xq2P riodr1xcb3/TlWfMMlB8zQ1d8pXNGFLYluDYq+V8XmtSKgrV5Cyx04d7nWtAnqWAwMkv fWEdxApg3d71YLbco2u+HNSXh6X3mT8cjbKEU8byd9yz3hFtfYQKzbLpkTb4ov3rtixS cqqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U1vhVEgs1+th3BOpaR2/7AunLyFVfwbl7IStUqFFTMU=; b=ss6JLFQ7/4o0z10iNHC1IerJd2W6HJlQJoZEkEF1vnH9BF8zsntzoColKGnVpVMcE5 ze6b3ZaHqr3aOCh2lZEw7H/iTKIQIVXbCr22Ud08NH+ro9UDwAVtVuYLCEaYd6LdDMwW eBG17dJl/sA9S2iVQmIPYnoz2sX9lWNXbGon14A+i+/5OIdeyzG1anYyb9v24rYPaGZM U5bZ59ilf69l16zK3JcieqIdrk08jGaPpu+gHpkeCAMp95p/SwZOSaz068nPOACLQmyN YGh4KtCDS7hFv+0N7Y4UgKi9GkcYoRwMi+BSR8v/wFjL8E05pA2s/BMTodliFJ32Ury+ 8zbA== X-Gm-Message-State: APjAAAXKF+CurVk5OPvXhetU5S3aE8dzzoA/Ok79Jpa8LPMKslo+At4P z24WHFtpsemj8cYRjPBM65aw9lNA X-Google-Smtp-Source: APXvYqybkgeW3X5EFvWMSHCl+1G1tMEsxJz8oleY+n/1BSkKn/eDIfPAFyq52TT8aTO9gJVGO8FNiw== X-Received: by 2002:a2e:9e81:: with SMTP id f1mr5955266ljk.29.1561071696157; Thu, 20 Jun 2019 16:01:36 -0700 (PDT) Original-Received: from localhost.localdomain (h77-53-36-254.cust.a3fiber.se. [77.53.36.254]) by smtp.gmail.com with ESMTPSA id s14sm130505ljd.88.2019.06.20.16.01.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 16:01:35 -0700 (PDT) X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:160917 Archived-At: POSIX.1-2017 defines that functions should have a name that 'consisting solely of underscores, digits, and alphabetics from the portable character set'. Make sure the name part of defun-prompt-regexp starts with a letter and allows underscores. * lisp/progmodes/sh-script.el (defun-prompt-regexp): Correct the function name part of the regexp. --- lisp/progmodes/sh-script.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 853a3500ee..24f242572f 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1619,9 +1619,9 @@ sh-mode (setq-local defun-prompt-regexp (concat "^\\(" - "\\(function[ \t]\\)?[ \t]*[[:alnum:]]+[ \t]*([ \t]*)" + "\\(function[ \t]\\)?[ \t]*[[:alpha:]][[:alnum:]_]+[ \t]*([ \t]*)" "\\|" - "function[ \t]+[[:alnum:]]+[ \t]*\\(([ \t]*)\\)?" + "function[ \t]+[[:alpha:]][[:alnum:]_]+[ \t]*\\(([ \t]*)\\)?" "\\)[ \t]*")) (setq-local add-log-current-defun-function #'sh-current-defun-name) (add-hook 'completion-at-point-functions -- 2.11.0