L2U: special-case remapping of <CR>

Author: carlobaldassi

autoload/LaTeXtoUnicode.vim

@@ -339,6 +339,11 @@ function! LaTeXtoUnicode#PutLiteral(k)
   return ''
 endfunction
 
+function! LaTeXtoUnicode#PutLiteralCR()
+  call feedkeys('', 'ni')
+  return ''
+endfunction
+
 " Function which saves the current insert-mode mapping of a key sequence `s`
 " and associates it with another key sequence `k` (e.g. stores the current
 " <Tab> mapping into the Fallback trigger)
@@ -360,9 +365,20 @@ function! s:L2U_SetFallbackMapping(s, k)
   else
     let cmd = 'imap '
     " This is a nasty hack used to prevent infinite recursion. It's not a
-    " general solution.
+    " general solution. Also, it doesn't work with <CR> since that stops
+    " parsing of the <C-R>=... expression, so we need to special-case it.
+    " Also, if the original mapping was intended to be recursive, this
+    " will break it.
     if mmdict["expr"]
-      let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
+      if a:s != "<CR>"
+        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
+      else
+        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteralCR()\<CR>", 'g')
+      endif
+      " Make the mapping silent even if it wasn't originally
+      if !mmdict["silent"]
+        let pre = pre . '<silent>'
+      endif
     endif
   endif
   exe cmd . pre . ' ' . a:k . ' ' . rhs