From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Carlos Pita Newsgroups: gmane.emacs.bugs Subject: bug#19754: sh-script.el: mostly wrong defun-prompt-regexp Date: Mon, 2 Feb 2015 23:05:31 -0300 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1422929230 8720 80.91.229.3 (3 Feb 2015 02:07:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Feb 2015 02:07:10 +0000 (UTC) To: 19754@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 03 03:07:09 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YIStQ-0000gx-VW for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Feb 2015 03:07:09 +0100 Original-Received: from localhost ([::1]:57452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIStQ-0001eX-4B for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Feb 2015 21:07:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIStM-0001eR-59 for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:07:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIStK-00023B-Vn for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:07:04 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIStK-000237-Se for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YIStK-00053I-GA for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:07:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Carlos Pita Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 03 Feb 2015 02:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19754 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.142292916519354 (code B ref -1); Tue, 03 Feb 2015 02:07:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 3 Feb 2015 02:06:05 +0000 Original-Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YISsO-000525-Ky for submit@debbugs.gnu.org; Mon, 02 Feb 2015 21:06:04 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33597) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YISsN-00051b-Qv for submit@debbugs.gnu.org; Mon, 02 Feb 2015 21:06:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YISsH-0001pi-IF for submit@debbugs.gnu.org; Mon, 02 Feb 2015 21:05:58 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:35336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YISsH-0001pe-Eu for submit@debbugs.gnu.org; Mon, 02 Feb 2015 21:05:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YISsD-0001b9-LF for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:05:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YISsC-0001p9-Sz for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:05:53 -0500 Original-Received: from mail-la0-x22c.google.com ([2a00:1450:4010:c03::22c]:63045) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YISsC-0001p2-Jm for bug-gnu-emacs@gnu.org; Mon, 02 Feb 2015 21:05:52 -0500 Original-Received: by mail-la0-f44.google.com with SMTP id s18so47232322lam.3 for ; Mon, 02 Feb 2015 18:05:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=2gulYJP41jVF1iaP/6GwQFy6IeTm3axzV0pO50F+pio=; b=KURIyVkUoAYsDggz+TcYl6QYqJUxAP2L7TfDPWWKwTpQm/zBzLDIdz5RdWWsqvVmgx ppwuLg8T8uBtFXW34PbnaNtzJHRWMm1bbeI5dsa4q8twKYHy3nhgkVM1hTWt5gelQ19j oW9j4q9P8SMR3ccOYMoTgKhlYQto/wx1KmlKMak1ndNhDzyXR17R7UIrz7iNh6D0lsEf BUvO86GfombIbv2pQdFpVAK996WdIp+vRyzQGiO561/ZS8V4+GRhR4u0+LR1SMlrroBl FCOgZxvBgrc8D5XgIeoC3p0RdciEAWVJCvLkbYr+miRNzo2LyFJCpfru4AUdF3NXig87 ZuJA== X-Received: by 10.112.176.236 with SMTP id cl12mr3095874lbc.3.1422929151557; Mon, 02 Feb 2015 18:05:51 -0800 (PST) Original-Received: by 10.112.124.202 with HTTP; Mon, 2 Feb 2015 18:05:31 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:99005 Archived-At: Tags: patch The defun regexp is defined for sh-sript mode as: (setq-local defun-prompt-regexp (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)")) At least in bash you have several valid forms not allowed by that regexp: 1) spaces between (, ), and { are optional 2) function name {...} (indeed, function {} is not even valid!) 3) function name () {...} 4) function name() {...} Also the concat seems pointless to me. Here is a patched version: (setq-local defun-prompt-regexp (concat "^\\(" "\\(function[ \t]\\)?[ \t]*[[:alnum:]]+[ \t]*([ \t]*)" "\\|" "function[ \t]+[[:alnum:]]+[ \t]*\\(([ \t]*)\\)?" "\\)[ \t]*"))