From 78c1a4cd0f7766327190268b8e3609c854ebfa54 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 16 Oct 2008 16:24:19 -0400 Subject: Indenting simple DML properly --- src/elisp/urweb-mode.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/elisp/urweb-mode.el') diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el index 5e217e1a..fb3db560 100644 --- a/src/elisp/urweb-mode.el +++ b/src/elisp/urweb-mode.el @@ -512,9 +512,16 @@ If anyone has a good algorithm for this..." (beginning-of-line) (current-indentation))) +(defconst urweb-sql-main-starters + '("SELECT" "INSERT" "UPDATE" "DELETE")) + (defconst urweb-sql-starters - '("FROM" "WHERE" "GROUP" "ORDER" "HAVING" "LIMIT" "OFFSET")) + (append urweb-sql-main-starters + '("^\\s-+FROM" "WHERE" "GROUP" "ORDER" "HAVING" "LIMIT" "OFFSET" + "VALUES" "SET"))) +(defconst urweb-sql-main-starters-re + (urweb-syms-re urweb-sql-main-starters)) (defconst urweb-sql-starters-re (urweb-syms-re urweb-sql-starters)) @@ -575,7 +582,9 @@ If anyone has a good algorithm for this..." (and (looking-at urweb-sql-starters-re) (save-excursion (and (re-search-backward urweb-sql-starters-re nil t) - (current-indentation)))) + (if (looking-at urweb-sql-main-starters-re) + (current-column) + (current-indentation))))) (and (setq data (assoc sym urweb-close-paren)) (urweb-indent-relative sym data)) -- cgit v1.2.3