aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c22ed24bb6..7b6b48b1018 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-23 Paul Eggert <eggert@cs.ucla.edu>
2
3 Use ${EXEEXT} more uniformly in makefiles
4 * Makefile.in (EMACS): Append ${EXEEXT}.
5
12015-02-23 Sam Steingold <sds@gnu.org> 62015-02-23 Sam Steingold <sds@gnu.org>
2 7
3 * files.el (recover-session): Handle `auto-save-list-file-prefix' 8 * files.el (recover-session): Handle `auto-save-list-file-prefix'
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc6326e1..22d5ddcf12f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
47# We never change directory before running Emacs, so a relative file 47# We never change directory before running Emacs, so a relative file
48# name is fine, and makes life easier. If we need to change 48# name is fine, and makes life easier. If we need to change
49# directory, we can use emacs --chdir. 49# directory, we can use emacs --chdir.
50EMACS = ../src/emacs 50EMACS = ../src/emacs${EXEEXT}
51 51
52# Command line flags for Emacs. 52# Command line flags for Emacs.
53 53