Merge git://pgdn.org/factor

diff --cc extra/opengl/opengl.factor
index 656c514cd12c58fb15349e3feba99886135a73b5,221b866a152785005ff955d8b71182b35f4e0ac4..f84aac56de28f932e8fe1c1d65c773b3f22f8a32
mode 100755,100644..100755
--- 1/extra/opengl/opengl.factor
--- 2/extra/opengl/opengl.factor
+++ b/extra/opengl/opengl.factor
@@@ -341,23 -328,20 +340,23 @@@ PREDICATE: gl-shader fragment-shader (f
      GL_ATTACHED_SHADERS gl-program-get-int ; inline
  
  : gl-program-shaders ( program -- shaders )
 -    dup gl-program-shaders-length
 -    [ dup "GLuint" <c-array> [ 0 <int> swap glGetAttachedShaders ] keep ] keep
 -    c-uint-array> ;
 +    dup gl-program-shaders-length [
 +        dup "GLuint" <c-array> 0 <int> over glGetAttachedShaders
 +    ] keep c-uint-array> ;
  
 -: delete-gl-program-only ( program -- ) glDeleteProgram ; inline
 +: delete-gl-program-only ( program -- )
 +    glDeleteProgram ; inline
  
 -: detach-gl-program-shader ( program shader -- ) glDetachShader ; inline
 +: detach-gl-program-shader ( program shader -- )
 +    glDetachShader ; inline
  
  : delete-gl-program ( program -- )
 -    dup gl-program-shaders [ 2dup detach-gl-program-shader delete-gl-shader ] each
 -    delete-gl-program-only ;
 +    dup gl-program-shaders [
 +        2dup detach-gl-program-shader delete-gl-shader
 +    ] each delete-gl-program-only ;
  
  : with-gl-program ( program quot -- )
-     swap glUseProgram [ call ] [ 0 glUseProgram ] [ ] cleanup ; inline
+     swap glUseProgram [ 0 glUseProgram ] [ ] cleanup ; inline
  
  PREDICATE: integer gl-program (gl-program?) ;