HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
[bpt/emacs.git]
/
nt
/
addpm.c
diff --git
a/nt/addpm.c
b/nt/addpm.c
index
48c7782
..
18057b5
100644
(file)
--- a/
nt/addpm.c
+++ b/
nt/addpm.c
@@
-1,5
+1,5
@@
/* Add entries to the GNU Emacs Program Manager folder.
/* Add entries to the GNU Emacs Program Manager folder.
- Copyright (C) 1995, 2001-201
3
Free Software Foundation, Inc.
+ Copyright (C) 1995, 2001-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-82,7
+82,7
@@
env_vars[] =
{
#ifdef OLD_PATHS
{"emacs_dir", NULL},
{
#ifdef OLD_PATHS
{"emacs_dir", NULL},
- {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp
;%emacs_dir%/leim
"},
+ {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"},
{"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
{"EMACSDATA", "%emacs_dir%/etc"},
{"EMACSPATH", "%emacs_dir%/bin"},
{"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
{"EMACSDATA", "%emacs_dir%/etc"},
{"EMACSPATH", "%emacs_dir%/bin"},