-diff -riwBu -Xex aspell-setter-sep06\common\config.cpp aspell-setter-sep06-modified\common\config.cpp\r
---- aspell-setter-sep06\common\config.cpp Mon Dec 12 17:41:06 2005\r
-+++ aspell-setter-sep06-modified\common\config.cpp Sun Oct 22 13:03:46 2006\r
+diff -riwBu -Xex aspell-setter-sep06/common/config.cpp aspell-setter-sep06-modified/common/config.cpp\r
+--- aspell-setter-sep06/common/config.cpp 2005-12-12 17:41:06.000000000 +0100\r
++++ aspell-setter-sep06-modified/common/config.cpp 2007-02-16 22:40:26.947401600 +0100\r
@@ -78,6 +78,10 @@\r
\r
namespace aspell {\r
static const KeyInfo config_keys[] = {\r
// the description should be under 50 chars\r
{"actual-dict-dir", KeyInfoString, "<dict-dir^master>", 0}\r
-@@ -1484,7 +1473,7 @@\r
+@@ -1484,12 +1473,12 @@\r
, {"per-conf-path", KeyInfoString, "<home-dir/per-conf>", 0}\r
, {"personal", KeyInfoString, PERSONAL,\r
N_("personal dictionary file name")}\r
- , {"personal-path", KeyInfoString, "<home-dir/personal>", 0}\r
-+ , {"personal-path", KeyInfoString, PERSONAL_DIR, 0}\r
++ , {"personal-path", KeyInfoString, "<personal-dir/personal>", 0}\r
, {"prefix", KeyInfoString, PREFIX,\r
N_("prefix directory")}\r
, {"repl", KeyInfoString, REPL,\r
-@@ -1525,10 +1514,8 @@\r
+ N_("replacements list file name") }\r
+- , {"repl-path", KeyInfoString, "<home-dir/repl>", 0}\r
++ , {"repl-path", KeyInfoString, "<personal-dir/repl>", 0}\r
+ , {"run-together", KeyInfoBool, "false",\r
+ N_("consider run-together words legal"), KEYINFO_MAY_CHANGE}\r
+ , {"run-together-limit", KeyInfoInt, "2",\r
+@@ -1524,12 +1513,6 @@\r
+ N_("search path for word list information files"), KEYINFO_HIDDEN}\r
, {"warn", KeyInfoBool, "true",\r
N_("enable warnings")}\r
- #ifdef WIN32PORT\r
+-#ifdef WIN32PORT\r
- , {"dict-subdir", KeyInfoString, "dicts",\r
- N_("sub directory for dictionaries")}\r
- , {"data-subdir", KeyInfoString, "data",\r
- N_("sub directory for other data")}\r
-+ , {"personal-dir", KeyInfoString, PERSONAL_DIR,\r
-+ N_("directory for personal dictionaries")}\r
- #endif\r
+-#endif\r
\r
//\r
-@@ -1587,5 +1574,88 @@\r
- config_impl_keys_begin,\r
+ // These options are generally used when creating dictionaries\r
+@@ -1574,7 +1557,10 @@\r
+ N_("suggest possible replacements"), KEYINFO_MAY_CHANGE}\r
+ , {"time" , KeyInfoBool, "false",\r
+ N_("time load time and suggest time in pipe mode"), KEYINFO_MAY_CHANGE}\r
+-\r
++ #ifdef WIN32PORT\r
++ , {"personal-dir", KeyInfoString, PERSONAL_DIR,\r
++ N_("directory for personal dictionaries")}\r
++ #endif\r
+ };\r
+ \r
+ const KeyInfo * config_impl_keys_begin = config_keys;\r
+@@ -1588,4 +1574,87 @@\r
config_impl_keys_end);\r
}\r
-+\r
+ \r
+#ifdef WIN32PORT\r
+\r
+ String ReadRegString(HKEY hive, String key, String name)\r
+ }\r
+\r
+#endif\r
- \r
++ \r
}\r
-diff -riwBu -Xex aspell-setter-sep06\common\vector.hpp aspell-setter-sep06-modified\common\vector.hpp\r
---- aspell-setter-sep06\common\vector.hpp Thu Oct 13 08:42:54 2005\r
-+++ aspell-setter-sep06-modified\common\vector.hpp Sun Sep 17 18:50:45 2006\r
+diff -riwBu -Xex aspell-setter-sep06/common/vector.hpp aspell-setter-sep06-modified/common/vector.hpp\r
+--- aspell-setter-sep06/common/vector.hpp 2005-10-13 09:42:54.000000000 +0200\r
++++ aspell-setter-sep06-modified/common/vector.hpp 2006-09-17 19:50:45.730606400 +0200\r
@@ -50,10 +50,10 @@\r
T * data_end() {return &*this->end();}\r
\r
\r
template <typename U>\r
U * datap() { \r
-diff -riwBu -Xex aspell-setter-sep06\win32\dirs.h aspell-setter-sep06-modified\win32\dirs.h\r
---- aspell-setter-sep06\win32\dirs.h Thu Oct 13 12:29:34 2005\r
-+++ aspell-setter-sep06-modified\win32\dirs.h Sun Oct 22 12:55:10 2006\r
-@@ -1,16 +1,27 @@\r
+diff -riwBu -Xex aspell-setter-sep06/win32/dirs.h aspell-setter-sep06-modified/win32/dirs.h\r
+--- aspell-setter-sep06/win32/dirs.h 2005-10-13 13:29:34.000000000 +0200\r
++++ aspell-setter-sep06-modified/win32/dirs.h 2007-02-16 22:52:43.486492800 +0100\r
+@@ -1,16 +1,26 @@\r
#ifndef dirs_h\r
#define dirs_h\r
\r
+# define DATA_DIR "!data-dir"\r
+# define DICT_DIR "!dict-dir"\r
+# define PERSONAL_DIR "!personal-dir"\r
++# define CONF_DIR "<home-dir>"\r
+\r
+#if defined(WIN32_USE_EXECUTABLE_DIR)\r
+# define HOME_DIR "<prefix>"\r
-+# define PERSONAL "<personal-dir>/<lang>.pws"\r
-+# define REPL "<personal-dir>/<lang>.prepl"\r
++# define PERSONAL "<lang>.pws"\r
++# define REPL "<lang>.prepl"\r
# define PREFIX "!prefix"\r
+#elif defined(WIN32_USE_PERSONAL_DIR)\r
+# define HOME_DIR "!home-dir"\r
-+# define PERSONAL "<personal-dir>/<lang>.pws"\r
-+# define REPL "<personal-dir>/<lang>.prepl"\r
++# define PERSONAL "<lang>.pws"\r
++# define REPL "<lang>.prepl"\r
+# define PREFIX "<home-dir>"\r
#else\r
-# define DATA_DIR "aspell-win32/data"\r
-# define DICT_DIR "dicts"\r
-# define PREFIX "aspell-win32"\r
+# define HOME_DIR "<$HOME|./>"\r
-+# define PERSONAL "<personal-dir>/.aspell.<lang>.pws"\r
-+# define REPL "<personal-dir>/.aspell.<lang>.prepl"\r
++# define PERSONAL ".aspell.<lang>.pws"\r
++# define REPL ".aspell.<lang>.prepl"\r
+# define PREFIX "<home-dir>"\r
#endif\r
-+\r
-+#define CONF_DIR HOME_DIR\r
\r
#endif\r
-diff -riwBu -Xex aspell-setter-sep06\win32\settings.h aspell-setter-sep06-modified\win32\settings.h\r
---- aspell-setter-sep06\win32\settings.h Wed Sep 06 09:51:16 2006\r
-+++ aspell-setter-sep06-modified\win32\settings.h Sun Sep 17 17:55:23 2006\r
+diff -riwBu -Xex aspell-setter-sep06/win32/settings.h aspell-setter-sep06-modified/win32/settings.h\r
+--- aspell-setter-sep06/win32/settings.h 2006-09-06 10:51:16.000000000 +0200\r
++++ aspell-setter-sep06-modified/win32/settings.h 2006-09-17 18:55:23.112916800 +0200\r
@@ -9,9 +9,6 @@\r
/* Defined if curses like POSIX Functions should be used */\r
#undef CURSES_ONLY\r
projects / features.git / commitdiff