diff options
| author | Vinicius Jose Latorre | 2007-08-01 21:43:11 +0000 |
|---|---|---|
| committer | Vinicius Jose Latorre | 2007-08-01 21:43:11 +0000 |
| commit | cdf5c17ae8c53ab4c9f51dea78df080001ae1fe2 (patch) | |
| tree | 43187c5fc734d3265b03f7dafd5201495b72fadd /src | |
| parent | a466449c4f77dea61a46132ad4087c7432a421be (diff) | |
| download | emacs-cdf5c17ae8c53ab4c9f51dea78df080001ae1fe2.tar.gz emacs-cdf5c17ae8c53ab4c9f51dea78df080001ae1fe2.zip | |
Adjust load-path
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/mac.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d50f9fbe518..32d0a243aa0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-01 Seiji Zenitani <zenitani@mac.com> | ||
| 2 | |||
| 3 | * mac.c (init_mac_osx_environment): Adjust load-path on self-contained | ||
| 4 | build. | ||
| 5 | |||
| 1 | 2007-07-31 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-07-31 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * gtkutil.c (xg_tool_bar_callback): Generate a single TOOL_BAR_EVENT. | 8 | * gtkutil.c (xg_tool_bar_callback): Generate a single TOOL_BAR_EVENT. |
| @@ -5327,12 +5327,12 @@ init_mac_osx_environment () | |||
| 5327 | q[0] = '\0'; | 5327 | q[0] = '\0'; |
| 5328 | 5328 | ||
| 5329 | strcpy (p, app_bundle_pathname); | 5329 | strcpy (p, app_bundle_pathname); |
| 5330 | strcat (p, "/Contents/Resources/lisp"); | 5330 | strcat (p, "/Contents/Resources/site-lisp"); |
| 5331 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) | 5331 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) |
| 5332 | strcat (q, p); | 5332 | strcat (q, p); |
| 5333 | 5333 | ||
| 5334 | strcpy (p, app_bundle_pathname); | 5334 | strcpy (p, app_bundle_pathname); |
| 5335 | strcat (p, "/Contents/Resources/leim"); | 5335 | strcat (p, "/Contents/Resources/lisp"); |
| 5336 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) | 5336 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) |
| 5337 | { | 5337 | { |
| 5338 | if (q[0] != '\0') | 5338 | if (q[0] != '\0') |
| @@ -5341,7 +5341,7 @@ init_mac_osx_environment () | |||
| 5341 | } | 5341 | } |
| 5342 | 5342 | ||
| 5343 | strcpy (p, app_bundle_pathname); | 5343 | strcpy (p, app_bundle_pathname); |
| 5344 | strcat (p, "/Contents/Resources/site-lisp"); | 5344 | strcat (p, "/Contents/Resources/leim"); |
| 5345 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) | 5345 | if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) |
| 5346 | { | 5346 | { |
| 5347 | if (q[0] != '\0') | 5347 | if (q[0] != '\0') |