From ba60ab8c6a300718eb1fa719757d3f5eeeccea6a Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 00:59:39 -0600 Subject: [PATCH 1/2] factor-menus: untabify --- extra/factory/factory-menus | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/extra/factory/factory-menus b/extra/factory/factory-menus index fa72fa6c9a..35ee75e31b 100644 --- a/extra/factory/factory-menus +++ b/extra/factory/factory-menus @@ -25,14 +25,14 @@ apps-menu> not [ new-wm-menu >apps-menu ] when { { "Emacs" [ "emacs &" system drop ] } { "KMail" [ "kmail &" system drop ] } { "Akregator" [ "akregator &" system drop ] } - { "Amarok" [ "amarok &" system drop ] } - { "K3b" [ "k3b &" system drop ] } - { "xchat" [ "xchat &" system drop ] } + { "Amarok" [ "amarok &" system drop ] } + { "K3b" [ "k3b &" system drop ] } + { "xchat" [ "xchat &" system drop ] } { "Nautilus" [ "nautilus --no-desktop &" system drop ] } - { "synaptic" [ "gksudo synaptic &" system drop ] } + { "synaptic" [ "gksudo synaptic &" system drop ] } { "Volume control" [ "gnome-volume-control &" system drop ] } { "Azureus" [ "~/azureus/azureus &" system drop ] } - { "Xephyr" [ "Xephyr -host-cursor :1 &" system drop ] } + { "Xephyr" [ "Xephyr -host-cursor :1 &" system drop ] } { "Stop Xephyr" [ "pkill Xephyr &" system drop ] } { "Stop Firefox" [ "pkill firefox &" system drop ] } } apps-menu> set-menu-items @@ -95,8 +95,8 @@ factory-menu> not [ new-wm-menu >factory-menu ] when { { "Maximize" [ maximize ] } { "Maximize Vertical" [ maximize-vertical ] } { "Restore" [ restore ] } - { "Hide" [ minimize ] } - { "Tile Master" [ tile-master ] } + { "Hide" [ minimize ] } + { "Tile Master" [ tile-master ] } } factory-menu> set-menu-items @@ -106,17 +106,17 @@ factory-menu> set-menu-items ! VAR: root-menu { { "xterm" [ "urxvt -bd grey +sb &" system drop ] } - { "Firefox" [ "firefox &" system drop ] } - { "xclock" [ "xclock &" system drop ] } - { "Apps >" [ apps-menu> <- popup ] } + { "Firefox" [ "firefox &" system drop ] } + { "xclock" [ "xclock &" system drop ] } + { "Apps >" [ apps-menu> <- popup ] } { "Factor >" [ factor-menu> <- popup ] } { "Unmapped frames >" [ unmapped-frames-menu> <- popup ] } - { "Emacs >" [ emacs-menu> <- popup ] } - { "Mail >" [ mail-menu> <- popup ] } - { "onigirihouse" [ "xterm -e 'ssh dharmatech@onigirihouse.com' &" - system drop ] } - { "Edit menus" [ edit-factory-menus ] } + { "Emacs >" [ emacs-menu> <- popup ] } + { "Mail >" [ mail-menu> <- popup ] } + { "onigirihouse" [ "xterm -e 'ssh dharmatech@onigirihouse.com' &" + system drop ] } + { "Edit menus" [ edit-factory-menus ] } { "Reload menus" [ load-factory-menus ] } - { "Factory >" [ factory-menu> <- popup ] } + { "Factory >" [ factory-menu> <- popup ] } } root-menu> set-menu-items From aae3913b5936e9f80409cf3a8fe1cf69b5e37d3a Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 01:01:14 -0600 Subject: [PATCH 2/2] io.files: temp-dir -> temp-directory --- core/io/files/files.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 108ace4393..7dbe8c229e 100755 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -155,10 +155,10 @@ M: pathname <=> [ pathname-string ] compare ; : with-file-appender ( path quot -- ) >r r> with-stream ; inline -: temp-dir ( -- path ) +: temp-directory ( -- path ) "temp" resource-path dup exists? not [ dup make-directory ] when ; -: temp-file ( name -- path ) temp-dir swap path+ ; \ No newline at end of file +: temp-file ( name -- path ) temp-directory swap path+ ; \ No newline at end of file