diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9b6f6ee356..97f4c007c72 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-23 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting. | ||
| 4 | |||
| 1 | 2013-11-22 Leo Liu <sdl.web@gmail.com> | 5 | 2013-11-22 Leo Liu <sdl.web@gmail.com> |
| 2 | 6 | ||
| 3 | * progmodes/octave.el (inferior-octave-startup): Spit out error | 7 | * progmodes/octave.el (inferior-octave-startup): Spit out error |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index d00330c3a9b..eb52b317e7b 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -106,7 +106,7 @@ COMPILE_FIRST = \ | |||
| 106 | 106 | ||
| 107 | # The actual Emacs command run in the targets below. | 107 | # The actual Emacs command run in the targets below. |
| 108 | # Prevent any setting of EMACSLOADPATH in user environment causing problems. | 108 | # Prevent any setting of EMACSLOADPATH in user environment causing problems. |
| 109 | emacs = unset EMACSLOADPATH; "$(EMACS)" $(EMACSOPT) | 109 | emacs = EMACSLOADPATH= "$(EMACS)" $(EMACSOPT) |
| 110 | 110 | ||
| 111 | # Common command to find subdirectories | 111 | # Common command to find subdirectories |
| 112 | setwins=for file in `find . -type d -print`; do \ | 112 | setwins=for file in `find . -type d -print`; do \ |