Commits

ZyX_I committed cc41ab9

Some fixes

  • Participants
  • Parent commits 1ae278d

Comments (0)

Files changed (1)

plugin/frawor.vim

                 \          'id': plid,
                 \ 'runtimepath': plrtp,
                 \     'version': plversion,
+                \     'oneload': !!a:oneload,
                 \        'file': a:file,
                 \         'sid': a:sid,
                 \'dependencies': {'plugin/frawor': 1},
                 \           'F': a:F,
                 \           'g': a:g,
                 \   'intprefix': 's:g.pls['.
-                \                   substitute(string(plugdict.id),
-                \                              '\n', '''."\n".''', 'g').']',
+                \                   substitute(string(plid), '\n', '''."\n".''',
+                \                              'g').']',
             \}
     let plugdict.F._frawor={}
     "▶3 Processing dependencies
     endif
     let plugdict=s:g.pls[a:plid]
     if plugdict.status!=2
+        let d={}
         "▶2 Loading dependencies
         for [dplid, d.Version] in items(plugdict.dependencies)
             if type(d.Version)!=type([])
             endif
             "▶3 Feature provides constructed function
             if has_key(feature, 'cons')
-                execute  'function plugdict.F._frawor.'.feature."(...)\n".
-                        \'    return call(s:g.features.index.'.feature.'.cons,'.
+                execute  'function plugdict.F._frawor.'.feature.id."(...)\n".
+                        \'    return call(s:g.features.index.'.
+                        \                               feature.id.'.cons, '.
                         \                '['.plugdict.intprefix."]+a:000,{})\n".
                         \'endfunction'
             endif
         endfor
         lockvar 1 plugdict.features
         "▲2
-        execute 'source '.fnameescape(plugdict.file)
+        if !plugdict.oneload
+            execute 'source '.fnameescape(plugdict.file)
+        endif
         let plugdict.status=2
         lockvar! plugdict.status
     endif
 "▶1 cons.warn
 let s:g.features.index.warn={
             \'plid': 'plugin/frawor',
+            \  'id': 'warn',
         \}
 function s:g.features.index.warn.cons(plugdict, msgid, ...)
     if !has_key(a:plugdict.g, '_messages')
 "▶1 cons.throw
 let s:g.features.index.throw={
             \'plid': 'plugin/frawor',
+            \  'id': 'throw',
         \}
 function s:g.features.index.throw.cons(plugdict, msgid, ...)
     call call(s:g.features.cons.warn, [a:plugdict, a:msgid]+a:000, {})