diff options
| author | Richard Copley <rcopley@gmail.com> | 2013-06-07 11:08:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-06-07 11:08:29 +0300 |
| commit | 6c0a9ed1b100c4dfbac327e6405396f1586267eb (patch) | |
| tree | 5376e993227b6999d5ae1a33a6124dec1e338670 /nt | |
| parent | efb860883d622f9e440ddbc0b610bd2f0a1a4aec (diff) | |
| download | emacs-6c0a9ed1b100c4dfbac327e6405396f1586267eb.tar.gz | |
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 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/epaths.nt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 41f6d81d592..5ed4dd2388c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-06-07 Richard Copley <rcopley@gmail.com> (tiny change) + + * epaths.nt (PATH_SITELOADSEARCH): Fix commentary. + 2013-06-03 Eli Zaretskii <eliz@gnu.org> * config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY. diff --git a/nt/epaths.nt b/nt/epaths.nt index 1e418550d52..6e297476528 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -41,10 +41,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim" /* Like PATH_LOADSEARCH, but contains the non-standard pieces. - These are the site-lisp directories, typically something like + These are the site-lisp directories. Configure sets this to + ${locallisppath}, which typically defaults to something like: <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp - Configure prepends any $locallisppath, as set by the - --enable-locallisppath argument. + but can be overridden by the --enable-locallisppath argument. This is combined with PATH_LOADSEARCH to make the default load-path. If the --no-site-lisp option is used, this piece is excluded. */ |