Fix ejc-get-ansi-sql-words fn merge.

kostafey · Nov 13, 2018 · 9eef50a · 9eef50a
1 parent 2d16f9c
commit 9eef50a
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/ejc-autocomplete.el b/ejc-autocomplete.el
@@ -118,13 +118,11 @@ Uppercase by default, set to nil to use downcase candidates."
 
 (defun ejc-get-ansi-sql-words ()
   (unless (or (ejc-return-point) (ejc-get-prefix-word))
-    (progn
-      (if ejc-candidates-uppercase
-          (append (mapcar 'upcase ejc-ansi-sql-words)
-                  (mapcar 'upcase ejc-auxulary-sql-words))
-        (append ejc-ansi-sql-words
-                ejc-auxulary-sql-words)))
-    nil))
+    (if ejc-candidates-uppercase
+        (append (mapcar 'upcase ejc-ansi-sql-words)
+                (mapcar 'upcase ejc-auxulary-sql-words))
+      (append ejc-ansi-sql-words
+              ejc-auxulary-sql-words))))
 
 (defun ac-ejc-documentation (symbol-name)
   "Return a documentation string for SYMBOL-NAME."