diff options
| author | Richard Copley | 2013-06-07 11:08:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-06-07 11:08:29 +0300 |
| commit | 6c0a9ed1b100c4dfbac327e6405396f1586267eb (patch) | |
| tree | 5376e993227b6999d5ae1a33a6124dec1e338670 /src | |
| parent | efb860883d622f9e440ddbc0b610bd2f0a1a4aec (diff) | |
| download | emacs-6c0a9ed1b100c4dfbac327e6405396f1586267eb.tar.gz emacs-6c0a9ed1b100c4dfbac327e6405396f1586267eb.zip | |
Fix bug #14513 with --enable-locallisppath not working on MS-Windows.
Makefile.in (msys_to_w32): Modify to support d:\foo file names.
(msys_lisppath_to_w32, msys_prefix_subst, msys_sed_sh_escape): New
variables.
(epaths-force-w32): Use them.
epaths.nt (PATH_SITELOADSEARCH): Fix commentary.
epaths.in: Fix commentary to PATH_SITELOADSEARCH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/epaths.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5a25758c421..c104b23c75e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-07 Richard Copley <rcopley@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * epaths.in: Fix commentary to PATH_SITELOADSEARCH. | ||
| 4 | |||
| 1 | 2013-06-06 Eli Zaretskii <eliz@gnu.org> | 5 | 2013-06-06 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (note_mouse_highlight): When mouse-highlight is off, | 7 | * xdisp.c (note_mouse_highlight): When mouse-highlight is off, |
diff --git a/src/epaths.in b/src/epaths.in index 0cf8cc9ce5b..1f5701e5337 100644 --- a/src/epaths.in +++ b/src/epaths.in | |||
| @@ -30,10 +30,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | /* Like PATH_LOADSEARCH, but contains the non-standard pieces. | 32 | /* Like PATH_LOADSEARCH, but contains the non-standard pieces. |
| 33 | These are the site-lisp directories, typically something like | 33 | These are the site-lisp directories. Configure sets this to |
| 34 | ${locallisppath}, which typically defaults to something like: | ||
| 34 | <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp | 35 | <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp |
| 35 | Configure prepends any $locallisppath, as set by the | 36 | but can be overridden by the --enable-locallisppath argument. |
| 36 | --enable-locallisppath argument. | ||
| 37 | This is combined with PATH_LOADSEARCH to make the default load-path. | 37 | This is combined with PATH_LOADSEARCH to make the default load-path. |
| 38 | If the --no-site-lisp option is used, this piece is excluded. | 38 | If the --no-site-lisp option is used, this piece is excluded. |
| 39 | */ | 39 | */ |