From 9eef50aeecf58fe7cc88722c8ade62edbe22c34e Mon Sep 17 00:00:00 2001 From: kostafey Date: Tue, 13 Nov 2018 12:55:40 +0200 Subject: [PATCH] Fix ejc-get-ansi-sql-words fn merge. --- ejc-autocomplete.el | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ejc-autocomplete.el b/ejc-autocomplete.el index 9c83005..fff3f52 100644 --- 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."