[COMMIT prog-modes] Update, correct mysql and postgres prompt regexps, sql.el

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1511689465 0 # Sun Nov 26 09:44:25 2017 +0000 # Node ID 9f912cfbbc9388080d9daefd26de74f15fe2d0b0 # Parent 22e1b0eb6d2948b7873b73e3751c0b310b7ae75b Update, correct mysql and postgres prompt regexps, sql.el ChangeLog addition: 2017-11-26 Aidan Kehoe <kehoea(a)parhasard.net&gt; * sql.el (sql-product-alist): Update the mysql prompt regexp to reflect that many mysql installs are MariaDB databases these days. Make the postgres prompt regexp a bit more reasonable, so C-a doesn't bring you to a greater-than operator in the SQL typed. diff -r 22e1b0eb6d29 -r 9f912cfbbc93 ChangeLog --- a/ChangeLog Mon Oct 12 09:46:59 2015 +0200 +++ b/ChangeLog Sun Nov 26 09:44:25 2017 +0000 ＠＠ -1,3 +1,11 ＠＠ +2017-11-26 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * sql.el (sql-product-alist): + Update the mysql prompt regexp to reflect that many mysql installs + are MariaDB databases these days. + Make the postgres prompt regexp a bit more reasonable, so C-a + doesn't bring you to a greater-than operator in the SQL typed. + 2015-10-12 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 2.32 released. diff -r 22e1b0eb6d29 -r 9f912cfbbc93 sql.el --- a/sql.el Mon Oct 12 09:46:59 2015 +0200 +++ b/sql.el Sun Nov 26 09:44:25 2017 +0000 ＠＠ -314,7 +314,7 ＠＠ :font-lock sql-mode-mysql-font-lock-keywords :sqli-login (user password database server) :sqli-connect sql-connect-mysql - :sqli-prompt-regexp "^mysql> " + :sqli-prompt-regexp "^\\(mysql\\|MariaDB \\[[^]]*\\]\\)> " :sqli-prompt-length 6) (oracle :font-lock sql-mode-oracle-font-lock-keywords ＠＠ -327,7 +327,7 ＠＠ :font-lock sql-mode-postgres-font-lock-keywords :sqli-login (user database server) :sqli-connect sql-connect-postgres - :sqli-prompt-regexp "^.*[#>] *" + :sqli-prompt-regexp "^[^>#]*[-=^!*'\"$>][#>] *" :sqli-prompt-length 5) (solid :font-lock sql-mode-solid-font-lock-keywords -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)