Merge 3a7919fdb5 into becbd2d353

fix: &sw may be a zero

autoload/delimitMate.vim

@@ -372,6 +372,9 @@ function! delimitMate#QuoteDelim(char) "{{{
     " If we are in a vim file and it looks like we're starting a comment, do
     " not add a closing char.
     return a:char
+  elseif a:char == "'" && index(split(&ft, '\.'), "clojure") != -1
+    " If we are in a clojure file, do not add a closing apostrophe.
+    return a:char
   elseif s:is_smart_quote(a:char)
     " Seems like a smart quote, insert a single char.
     return a:char
@@ -483,8 +486,9 @@ function! delimitMate#ExpandReturn() "{{{
       " indentation is controlled by 'smartindent', and the first character on
       " the new line is '}'. If this were typed manually it would reindent to
       " match the current line. Let's reproduce that behavior.
-      let shifts = indent('.') / &sw
+      let sw = &sw == 0 ? &ts : &sw
-      let spaces = indent('.') - (shifts * &sw)
+      let shifts = indent('.') / sw
+      let spaces = indent('.') - (shifts * sw)
       let val .= "^\<C-D>".repeat("\<C-T>", shifts).repeat(' ', spaces)
     endif
     " Expand: