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 v2] Allow underscore in defun-prompt-regex names for sh-script Date: Sun, 23 Jun 2019 23:00:25 +0200 Message-ID: <20190623210025.8366-1-ola.nilsson@gmail.com> References: <20190620230122.22553-1-ola.nilsson@gmail.com> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="87511"; 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 Sun Jun 23 23:01:20 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 1hf9c0-000Mf3-HW for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Jun 2019 23:01:20 +0200 Original-Received: from localhost ([::1]:46756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hf9bz-0005Mp-B1 for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Jun 2019 17:01:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56619) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hf9bl-0005Km-FO for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 17:01:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hf9bk-0005bk-Ge for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 17:01:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41399) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hf9bi-0005Ys-4q for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 17:01:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hf9bi-0004iu-0I for bug-gnu-emacs@gnu.org; Sun, 23 Jun 2019 17:01:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <20190620230122.22553-1-ola.nilsson@gmail.com> Resent-From: Ola Nilsson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Jun 2019 21:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36317 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 36317-submit@debbugs.gnu.org id=B36317.156132363816721 (code B ref 36317); Sun, 23 Jun 2019 21:01:01 +0000 Original-Received: (at 36317) by debbugs.gnu.org; 23 Jun 2019 21:00:38 +0000 Original-Received: from localhost ([127.0.0.1]:54943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hf9bJ-0004LI-On for submit@debbugs.gnu.org; Sun, 23 Jun 2019 17:00:38 -0400 Original-Received: from mail-lf1-f50.google.com ([209.85.167.50]:34113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hf9bH-0004CZ-Ih for 36317@debbugs.gnu.org; Sun, 23 Jun 2019 17:00:36 -0400 Original-Received: by mail-lf1-f50.google.com with SMTP id y198so8531139lfa.1 for <36317@debbugs.gnu.org>; Sun, 23 Jun 2019 14:00:35 -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=cj+cRlDZZb33SsJxVtDC5gEefuIHUhcPM8kUdkZf/W8=; b=BayCen9R89cup1nG/0LWbgIGMDGvkhWEeB/AEX7W+AvO+mUtYhXqbe1OawShRWK5GL QfJIqeYtEOCTySNnTtzYyUsMfKgzI4gjJkA9iNpRhRKSQIHOJrVXL+dQy5EaolHs4ntU K1tGQUVDq7J3FVhxPOUF7uW39TyEEqe1aLlavfdErNlo+8JFPj/NFO4g2tJ31ut8BPlC 5NANi4m9CoLVUlQLd+aZ3AhCuAZQg1EgQsTtbHfYbdS9mq9i4Tq1GJIxX/pW9ybX91e6 elzo/ojOTN/f1i6mRO/pOObTSs8KM1LvTu2SDe/PWmpiZxCwuRdP/l3BEU3M404IiTr6 +AfA== 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=cj+cRlDZZb33SsJxVtDC5gEefuIHUhcPM8kUdkZf/W8=; b=gXRHXhaUcyVw6BwobPLOU5k5sJfVJy4DIJt64Salx2HvpSerbuP+zidEgDA01SH2dS t7m+dLj1ft1U8v9yvFj7SUIldflUFPiyJJp4t+0Fu4GxV6FT7PDGYt+D3dVUKnT+WLDr xPgnzZdKQSsM7ozcfS6xghNCHQsQuQ89fswqx2ybmQFJdhU1c5z9We96wDZY1BXA49EJ NIaBBWVuCCCRHzS29IghSXa8fYrbtZUXbaWEzYmPv7puc8RRo/CUGzixmU6UjswOnlUo DqWrU81Ia4XWjZQy+rLdk8wY1NdcZiTvS/93Rzu3Jl4peI/+oESxGBuRC600IPYdmflQ P4RA== X-Gm-Message-State: APjAAAXmBM9c+qsQC637FbnHldnwTggd8od15Fya3RVXYWhJKRxnV7Zs iXtJme7ZeZJHIbxsDzfS19tyKOFU X-Google-Smtp-Source: APXvYqzwqn7RMVkxKChEiXLii0IHOMc5kjCa/rh/nCNLQ7uC9MZP/GoN+a04XSd+j4TFlIisM8whqg== X-Received: by 2002:ac2:5382:: with SMTP id g2mr17891437lfh.92.1561323629150; Sun, 23 Jun 2019 14:00:29 -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 25sm1416701ljv.40.2019.06.23.14.00.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jun 2019 14:00:28 -0700 (PDT) X-Mailer: git-send-email 2.11.0 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:161173 Archived-At: * lisp/progmodes/sh-script.el (defun-prompt-regexp): Allow underscore in function names. --- 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..8a0ab20d70 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]*[[:alnum:]_]+[ \t]*([ \t]*)" "\\|" - "function[ \t]+[[:alnum:]]+[ \t]*\\(([ \t]*)\\)?" + "function[ \t]+[[:alnum:]_]+[ \t]*\\(([ \t]*)\\)?" "\\)[ \t]*")) (setq-local add-log-current-defun-function #'sh-current-defun-name) (add-hook 'completion-at-point-functions -- 2.11.0