#
#
# patch "option.hh"
#  from [6b3ac60b406b88700b06236224b311daed0894d5]
#    to [82dad5ae3a07d89df3078564498e9b49d4cc092a]
# 
# patch "options_list.hh"
#  from [6ad0e9b35da1627403a905a5ed4917e797a1e9b5]
#    to [67023185e0e775e535d178143ddad30bd6b2f298]
# 
# patch "transforms.hh"
#  from [f6a91fd1ca667f76e8a84da4358e323988d7bdaa]
#    to [b2fdb8c0ed6409e99fac04d55e765d38c23158fd]
#
============================================================
--- option.hh	6b3ac60b406b88700b06236224b311daed0894d5
+++ option.hh	82dad5ae3a07d89df3078564498e9b49d4cc092a
@@ -28,7 +28,6 @@ public:
 class arg_type : public utf8 {
 public:
   explicit arg_type(void) : utf8() {}
-  //explicit arg_type(std::string const & s) : utf8(s) {}
   arg_type(std::string const & s, origin::type f) : utf8(s, f) {}
   explicit arg_type(utf8 const & u) : utf8(u) {}
 };
============================================================
--- options_list.hh	6ad0e9b35da1627403a905a5ed4917e797a1e9b5
+++ options_list.hh	67023185e0e775e535d178143ddad30bd6b2f298
@@ -138,6 +138,7 @@ OPT(revs_only, "revs-only", bool, false,
 }
 #endif
 
+// Remember COMMA doesn't work with GOPT, use long form.
 //GOPT(conf_dir, "confdir", system_path, get_default_confdir() COMMA origin::user,
 //     gettext_noop("set location of configuration directory"))
 OPTVAR(globals, system_path, conf_dir, get_default_confdir() COMMA origin::user)
@@ -373,6 +374,7 @@ OPTION(globals, key, true, "key,k", gett
 }
 #endif
 
+// Remember COMMA doesn't work with GOPT, use long form.
 //GOPT(key_dir, "keydir", system_path, get_default_keydir() COMMA origin::user,
 //     gettext_noop("set location of key store"))
 OPTVAR(globals, system_path, key_dir, get_default_keydir() COMMA origin::user)
============================================================
--- transforms.hh	f6a91fd1ca667f76e8a84da4358e323988d7bdaa
+++ transforms.hh	b2fdb8c0ed6409e99fac04d55e765d38c23158fd
@@ -95,8 +95,6 @@ inline std::string encode_hexenc(std::st
 inline std::string encode_hexenc(std::string const & in,
                                  origin::type made_from)
 { return xform<Botan::Hex_Encoder>(in, made_from); }
-//inline template<typename T> std::string encode_hexenc(T const & in)
-//{ return encode_hexenc(in(), in.made_from); }
 inline std::string decode_hexenc(std::string const & in,
                                  origin::type made_from)
 { return xform<Botan::Hex_Decoder>(in, made_from); }