summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--admin/ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--etc/AUTHORS16
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/PROBLEMS2
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emacs-lisp/authors.el12
-rw-r--r--lisp/emacs-lisp/find-gc.el2
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sed1v2.inp2
-rw-r--r--src/ChangeLog6
-rw-r--r--src/deps.mk2
-rw-r--r--src/unexcoff.c (renamed from src/unexec.c)9
14 files changed, 59 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 678583b9cd..8a72061226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * configure.in (UNEXEC_OBJ): Rename unexec.o => unexcoff.o.
+
2010-08-04 Andreas Schwab <schwab@linux-m68k.org>
* configure.in: Restore accidentally removed use of
diff --git a/admin/ChangeLog b/admin/ChangeLog
index e082eee36b..7ce3321dd3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * MAINTAINERS: Rename src/unexec.c => src/unexcoff.c.
+
2010-07-24 Christoph Scholtes <cschol2112@gmail.com>
* admin.el: Write version number to nt/makefile.w32-in.
diff --git a/configure.in b/configure.in
index 9ef12ff288..7a4aaf4ea2 100644
--- a/configure.in
+++ b/configure.in
@@ -883,7 +883,7 @@ AC_SUBST(CANNOT_DUMP)
UNEXEC_OBJ=unexelf.o
case "$opsys" in
- # MSDOS uses unexec.o
+ # MSDOS uses unexcoff.o
# MSWindows uses unexw32.o
aix4-2)
UNEXEC_OBJ=unexaix.o
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 26611a57de..916f8cdd79 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1042,7 +1042,7 @@ and changed nndoc.el allout.el bytecomp.el gnus-sum.el gnus-util.el
François-David Collin: changed message.el mm-decode.el
-Fred Fish: changed linux.h unexec.c
+Fred Fish: changed linux.h unexcoff.c
Fred Oberhauser: changed nnmail.el
@@ -1273,7 +1273,7 @@ Inge Wallin: co-wrote avl-tree.el ewoc.el
Inoue Seiichiro: changed xterm.c xfns.c xterm.h
International Business Machines: changed emacs.c fileio.c process.c
- sysdep.c unexec.c
+ sysdep.c unexcoff.c
Irie Tetsuya: changed gnus.texi message.texi
@@ -1334,7 +1334,7 @@ James TD Smith: changed org.el org-colview.el org-clock.el
James Troup: changed gnus-sum.el
-James Van Artsdalen: changed unexec.c usg5-4.h
+James Van Artsdalen: changed unexcoff.c usg5-4.h
James Wright: changed em-unix.el
@@ -2176,7 +2176,7 @@ and changed tramp.texi dbusbind.c dbus.texi ange-ftp.el trampver.el
simple.el vc.el configure.in dired.el and 50 other files
Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
- unexec.c
+ unexcoff.c
Michael D. Ernst: wrote reposition.el
and changed dired-x.el uniquify.el ispell.el bibtex.el rmail.el dired.el
@@ -2200,7 +2200,7 @@ Michael I. Bushnell: changed rmail.el simple.el callproc.c gnu.h gnus.el
Michael K. Johnson: changed configure.in emacs.c intel386.h linux.h
mem-limits.h process.c sysdep.c syssignal.h systty.h template.h
- unexec.c
+ unexcoff.c
Michael Kifer: wrote ediff-diff.el ediff-help.el ediff-hook.el
ediff-init.el ediff-merg.el ediff-mult.el ediff-ptch.el ediff-util.el
@@ -2259,7 +2259,7 @@ and changed gnus-score.el
Microelectronics and Computer Technology Corporation: changed
emacsclient.c etags.c lisp.h movemail.c rmail.el rmailedit.el
rmailkwd.el rmailmsc.el rmailout.el rmailsum.el scribe.el server.el
- sysdep.c unexec.c xmenu.c
+ sysdep.c unexcoff.c xmenu.c
Mikael Djurfeldt: changed xdisp.c
@@ -2685,7 +2685,7 @@ and changed files.el keyboard.c simple.el xterm.c xdisp.c Makefile.in
Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el rfc822.el
terminal.el yow.el
and changed files.el sysdep.c rmail.el info.el keyboard.c bytecomp.el
- fileio.c simple.el process.c startup.el window.c editfns.c unexec.c
+ fileio.c simple.el process.c startup.el window.c editfns.c unexcoff.c
xfns.c keymap.c minibuf.c sendmail.el buffer.c dispnew.c emacs.c
subr.el and 129 other files
@@ -2921,7 +2921,7 @@ Slawomir Nowaczyk: changed emacs.py python.el TUTORIAL.pl flyspell.el
ls-lisp.el w32proc.c
Spencer Thomas: changed dabbrev.el emacsclient.c gnus.texi server.el
- unexec.c
+ unexcoff.c
Sriram Karra: changed message.el
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9aa7f76723..a4c4507fd7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * AUTHORS: Rename unexec.o => unexcoff.o.
+ * PROBLEMS: Rename unexec.o => unexcoff.o.
+
2010-07-31 Eli Zaretskii <eliz@gnu.org>
* tutorials/TUTORIAL.he: New file.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 2fc0e29b30..6609f18582 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2740,7 +2740,7 @@ build Emacs in a directory on a local disk.
Two causes have been seen for such problems.
1) On a system where getpagesize is not a system call, it is defined
-as a macro. If the definition (in both unexec.c and malloc.c) is wrong,
+as a macro. If the definition (in both unex*.c and malloc.c) is wrong,
it can cause problems like this. You might be able to find the correct
value in the man page for a.out (5).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27e66a84f8..9ab754afe6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * emacs-lisp/find-gc.el (find-gc-source-files): Rename
+ unexec.c => unexcoff.c.
+
+ * emacs-lisp/authors.el (authors-fixed-entries): Rename
+ unexec.c => unexcoff.c.
+
2010-08-05 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-handle-dired-uncache): Flush directory
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 020729e2c7..5aea033fc7 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -354,7 +354,7 @@ Changes to files in this list are not listed.")
;; No longer distributed.
;;; ("Viktor Dukhovni" :wrote "unexsunos4.c")
("Paul Eggert" :wrote "rcs2log" "vcdiff")
- ("Fred Fish" :changed "unexec.c")
+ ("Fred Fish" :changed "unexcoff.c")
;; No longer distributed.
;;; ("Tim Fleehart" :wrote "makefile.nt")
("Keith Gabryelski" :wrote "hexl.c")
@@ -377,13 +377,13 @@ Changes to files in this list are not listed.")
"indent.c" "search.c" "xdisp.c" "region-cache.c" "region-cache.h")
;; ibmrt.h, ibmrt-aix.h no longer distributed.
("International Business Machines" :changed "emacs.c" "fileio.c"
- "process.c" "sysdep.c" "unexec.c")
+ "process.c" "sysdep.c" "unexcoff.c")
;; No longer distributed.
;;; ("Ishikawa Chiaki" :changed "aviion.h" "dgux.h")
;; ymakefile no longer distributed.
("Michael K. Johnson" :changed "configure.in" "emacs.c" "intel386.h"
"mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h"
- "systty.h" "unexec.c" "linux.h")
+ "systty.h" "unexcoff.c" "linux.h")
;; No longer distributed.
;;; ("Kyle Jones" :wrote "mldrag.el")
("Henry Kautz" :wrote "bib-mode.el")
@@ -408,7 +408,7 @@ Changes to files in this list are not listed.")
"rmail.el" "rmailedit.el" "rmailkwd.el"
"rmailmsc.el" "rmailout.el" "rmailsum.el" "scribe.el"
;; It was :wrote for xmenu.c, but it has been rewritten since.
- "server.el" "lisp.h" "sysdep.c" "unexec.c" "xmenu.c")
+ "server.el" "lisp.h" "sysdep.c" "unexcoff.c" "xmenu.c")
("Niall Mansfield" :changed "etags.c")
("Brian Marick" :cowrote "hideif.el")
("Marko Kohtala" :changed "info.el")
@@ -463,9 +463,9 @@ Changes to files in this list are not listed.")
("Kayvan Sylvan" :changed "supercite.el")
;; No longer distributed: emacsserver.c, tcp.c.
("Spencer Thomas" :changed "emacsclient.c" "server.el"
- "dabbrev.el" "unexec.c" "gnus.texi")
+ "dabbrev.el" "unexcoff.c" "gnus.texi")
("Jonathan Vail" :changed "vc.el")
- ("James Van Artsdalen" :changed "usg5-4.h" "unexec.c")
+ ("James Van Artsdalen" :changed "usg5-4.h" "unexcoff.c")
;; No longer distributed: src/makefile.nt, lisp/makefile.nt
;; winnt.el renamed to w32-fns.el; nt.[ch] to w32.[ch];
;; ntheap.[ch] to w32heap.[ch]; ntinevt.c to w32inevt.c;
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 3ca1df466b..49d3a7075d 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -60,7 +60,7 @@ Each entry has the form (FUNCTION . FUNCTIONS-IT-CALLS).")
"indent.c" "search.c" "regex.c" "undo.c"
"alloc.c" "data.c" "doc.c" "editfns.c"
"callint.c" "eval.c" "fns.c" "print.c" "lread.c"
- "abbrev.c" "syntax.c" "unexec.c"
+ "abbrev.c" "syntax.c" "unexcoff.c"
"bytecode.c" "process.c" "callproc.c" "doprnt.c"
"x11term.c" "x11fns.c"))
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index bc79366689..7df8988041 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of
+ unexec.c => unexcoff.c.
+
2010-07-29 Chad Brown <yandros@mit.edu>
* sed2v2.inp (HAVE_DIRENT_H): Edit to 1.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 95ef5305d4..4be1bccefd 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -118,7 +118,7 @@ s/\.h\.in/.h-in/
/^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/
/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
-/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/
+/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexcoff.o/
/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/
/^DEPFLAGS *=/s/@DEPFLAGS@//
/^MKDEPDIR *=/s/@MKDEPDIR@//
diff --git a/src/ChangeLog b/src/ChangeLog
index d8177bbe8a..6841b2644d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-05 Eli Zaretskii <eliz@gnu.org>
+
+ * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co].
+
+ * unexcoff.c: Renamed from unexec.c.
+
2010-08-04 Stefan Monnier <monnier@iro.umontreal.ca>
* sysdep.c (child_setup_tty): Comment-out left-over non-ICANON code.
diff --git a/src/deps.mk b/src/deps.mk
index e926939772..8eeed3822d 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -190,7 +190,7 @@ undo.o: undo.c buffer.h commands.h window.h dispextern.h lisp.h $(config_h)
unexaix.o: unexaix.c lisp.h $(config_h)
unexalpha.o: unexalpha.c $(config_h)
unexcw.o: unexcw.c lisp.h $(config_h)
-unexec.o: unexec.c lisp.h $(config_h)
+unexcoff.o: unexcoff.c lisp.h $(config_h)
unexelf.o: unexelf.c $(config_h)
unexhp9k800.o: unexhp9k800.c $(config_h)
unexmacosx.o: unexmacosx.c $(config_h)
diff --git a/src/unexec.c b/src/unexcoff.c
index f7f93b066d..ed319ec8e7 100644
--- a/src/unexec.c
+++ b/src/unexcoff.c
@@ -18,12 +18,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/*
- * unexec.c - Convert a running program into an a.out file.
+ * unexcoff.c - Convert a running program into an a.out or COFF file.
+ *
+ * ==================================================================
+ * Note: This file is currently used only by the MSDOS (a.k.a. DJGPP)
+ * build of Emacs. If you are not interested in the MSDOS build, you
+ * are looking at the wrong version of unexec!
+ * ==================================================================
*
* Author: Spencer W. Thomas
* Computer Science Dept.
* University of Utah
* Date: Tue Mar 2 1982
+ * Originally under the name unexec.c.
* Modified heavily since then.
*
* Synopsis: