Also ui.pixel-formats.private does not exist so remove that.
Fixes #2298.
ui.backend.gtk.input-methods ui.backend.gtk.io ui.backend.x11.keys
ui.clipboards ui.event-loop ui.gadgets ui.gadgets.private
ui.gadgets.worlds ui.gestures ui.pixel-formats
ui.backend.gtk.input-methods ui.backend.gtk.io ui.backend.x11.keys
ui.clipboards ui.event-loop ui.gadgets ui.gadgets.private
ui.gadgets.worlds ui.gestures ui.pixel-formats
-ui.pixel-formats.private ui.private vocabs.loader ;
+ui.private vocabs.loader ;
IN: ui.backend.gtk
SINGLETON: gtk-ui-backend
IN: ui.backend.gtk
SINGLETON: gtk-ui-backend
vocab-name "Already using ``" "'' vocabulary" surround note.
] [
manifest get
vocab-name "Already using ``" "'' vocabulary" surround note.
] [
manifest get
- [ [ load-vocab ] dip search-vocabs>> push ]
+ [ [ ?load-vocab ] dip search-vocabs>> push ]
[ [ vocab-name ] dip search-vocab-names>> adjoin ]
2bi
] if ;
[ [ vocab-name ] dip search-vocab-names>> adjoin ]
2bi
] if ;
M: object lookup-vocab vocab-name dictionary get at ;
M: object lookup-vocab vocab-name dictionary get at ;
+ERROR: no-vocab-named name ;
+
+: ?lookup-vocab ( vocab-spec -- vocab )
+ dup lookup-vocab [ nip ] [ no-vocab-named ] if* ;
+
GENERIC: vocab-words-assoc ( vocab-spec -- assoc/f )
M: vocab vocab-words-assoc words>> ;
GENERIC: vocab-words-assoc ( vocab-spec -- assoc/f )
M: vocab vocab-words-assoc words>> ;
: load-vocab ( name -- vocab )
[ require ] [ lookup-vocab ] bi ;
: load-vocab ( name -- vocab )
[ require ] [ lookup-vocab ] bi ;
+
+: ?load-vocab ( name -- vocab )
+ [ require ] [ ?lookup-vocab ] bi ;