From 36226abd21546557b176caf1fd9446d2869366da Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Mon, 1 Jun 2009 23:09:30 +0200 Subject: [PATCH] FUEL: developer-name is not overriden in scaffolds if so desired. --- extra/fuel/fuel.factor | 10 ++++++---- misc/fuel/fuel-scaffold.el | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index 5d4149867b..ded10b66cb 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -134,14 +134,16 @@ PRIVATE> ! Scaffold support +: fuel-scaffold-name ( devname -- ) + [ developer-name set ] when* ; + : fuel-scaffold-vocab ( root name devname -- ) - developer-name set dup [ scaffold-vocab ] dip + [ fuel-scaffold-name dup [ scaffold-vocab ] dip ] with-scope dup require vocab-source-path (normalize-path) fuel-eval-set-result ; : fuel-scaffold-help ( name devname -- ) - developer-name set - dup require dup scaffold-help vocab-docs-path - (normalize-path) fuel-eval-set-result ; + [ fuel-scaffold-name dup require dup scaffold-help ] with-scope + vocab-docs-path (normalize-path) fuel-eval-set-result ; : fuel-scaffold-get-root ( name -- ) find-vocab-root fuel-eval-set-result ; diff --git a/misc/fuel/fuel-scaffold.el b/misc/fuel/fuel-scaffold.el index ac400c5622..711862b615 100644 --- a/misc/fuel/fuel-scaffold.el +++ b/misc/fuel/fuel-scaffold.el @@ -28,7 +28,8 @@ (defcustom fuel-scaffold-developer-name user-full-name "The name to be inserted as yours in scaffold templates." - :type 'string + :type '(choice string + (const :tag "Factor's value for developer-name" nil)) :group 'fuel-scaffold)