# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1165296336 0
# Node ID 89cf360cc26e348e640829b95dcc44322b9ef5bd
# Parent  07d0c7e67ef3c877fcd061d3d2654a431f733ebf
(sql-mode-abbrev-table): Define abbrevs even if abbrev-table is
non-nil (saved user abbrevs may have been restored).

diff -r 07d0c7e67ef3 -r 89cf360cc26e lisp/progmodes/sql.el
--- a/lisp/progmodes/sql.el	Tue Dec 05 05:25:17 2006 +0000
+++ b/lisp/progmodes/sql.el	Tue Dec 05 05:25:36 2006 +0000
@@ -847,23 +847,24 @@
 (defvar sql-mode-abbrev-table nil
   "Abbrev table used in `sql-mode' and `sql-interactive-mode'.")
 (unless sql-mode-abbrev-table
-  (define-abbrev-table 'sql-mode-abbrev-table nil)
-  (mapcar
-    ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev.
-   '(lambda (abbrev)
-      (let ((name (car abbrev))
-	    (expansion (cdr abbrev)))
-	(condition-case nil
-	    (define-abbrev sql-mode-abbrev-table name expansion nil 0 t)
-	  (error
-	   (define-abbrev sql-mode-abbrev-table name expansion)))))
-   '(("ins" "insert")
-    ("upd" "update")
-    ("del" "delete")
-    ("sel" "select")
-    ("proc" "procedure")
-    ("func" "function")
-    ("cr" "create"))))
+  (define-abbrev-table 'sql-mode-abbrev-table nil))
+
+(mapcar
+ ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev.
+ '(lambda (abbrev)
+    (let ((name (car abbrev))
+          (expansion (cdr abbrev)))
+      (condition-case nil
+          (define-abbrev sql-mode-abbrev-table name expansion nil 0 t)
+        (error
+         (define-abbrev sql-mode-abbrev-table name expansion)))))
+ '(("ins" "insert")
+   ("upd" "update")
+   ("del" "delete")
+   ("sel" "select")
+   ("proc" "procedure")
+   ("func" "function")
+   ("cr" "create")))
 
 ;; Syntax Table