From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: steve@sanityinc.com Newsgroups: gmane.emacs.devel Subject: (unknown) Date: Mon, 08 Feb 2016 20:54:53 +1300 Message-ID: NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1454918163 13885 80.91.229.3 (8 Feb 2016 07:56:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 8 Feb 2016 07:56:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 08 08:55:54 2016 Return-path: Envelope-to: ged-emacs-devel@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 1aSgfo-0007Mp-E6 for ged-emacs-devel@m.gmane.org; Mon, 08 Feb 2016 08:55:52 +0100 Original-Received: from localhost ([::1]:42202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSgfn-0007LW-Q4 for ged-emacs-devel@m.gmane.org; Mon, 08 Feb 2016 02:55:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSgfZ-0007LL-HH for emacs-devel@gnu.org; Mon, 08 Feb 2016 02:55:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSgfW-0003g0-AR for emacs-devel@gnu.org; Mon, 08 Feb 2016 02:55:37 -0500 Original-Received: from purcellpeople.com ([85.214.32.38]:36218 helo=h1189701.stratoserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSgfW-0003fs-3T for emacs-devel@gnu.org; Mon, 08 Feb 2016 02:55:34 -0500 Original-Received: from Mandala.local (unknown [210.54.38.34]) by h1189701.stratoserver.net (Postfix) with ESMTPSA id 2B05427AC0B7 for ; Mon, 8 Feb 2016 08:54:59 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 85.214.32.38 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:199494 Archived-At: From: Steve Purcell Date: Mon, 8 Feb 2016 20:47:43 +1300 Subject: [PATCH] Safer prompt-regexp for postgres/vertica in sql-interactive-mode --text follows this line-- Fixes issue 22596, whereby "_" is now not considered a word constituent character in sql-interactive-mode, so prompts like "foo_dev# " are not correctly detected. --- lisp/progmodes/sql.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index fd59f46..90c8dfe 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -462,9 +462,9 @@ sql-product-alist :list-all ("\\d+" . "\\dS+") :list-table ("\\d+ %s" . "\\dS+ %s") :completion-object sql-postgres-completion-object - :prompt-regexp "^\\w*=[#>] " + :prompt-regexp "^[[:alpha:]_]*=[#>] " :prompt-length 5 - :prompt-cont-regexp "^\\w*[-(][#>] " + :prompt-cont-regexp "^[[:alpha:]_]*[-(][#>] " :input-filter sql-remove-tabs-filter :terminator ("\\(^\\s-*\\\\g$\\|;\\)" . "\\g")) @@ -514,9 +514,9 @@ sql-product-alist :sqli-comint-func sql-comint-vertica :list-all ("\\d" . "\\dS") :list-table "\\d %s" - :prompt-regexp "^\\w*=[#>] " + :prompt-regexp "^[[:alpha:]_]*=[#>] " :prompt-length 5 - :prompt-cont-regexp "^\\w*[-(][#>] ") + :prompt-cont-regexp "^[[:alpha:]_]*[-(][#>] ") ) "An alist of product specific configuration settings. -- 2.7.1