From: Karoly Lorentey <lorentey@elte.hu>
Date: Fri, 13 May 2005 22:59:23 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 296-306)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~256
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=892f9671ada52150f280915fb34970b7acb0312a;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 296-306)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
---

892f9671ada52150f280915fb34970b7acb0312a
diff --cc mac/makefile.MPW
index 2f1d6750a98,76217d24101..6222373fdeb
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@@ -994,97 -996,21 +996,22 @@@ DistClean Ä Clea
  # Variables and rules for target "Doc" #
  #--------------------------------------#
  
- EmacsSource = ¶
- 	"{Src}abbrev.c" ¶
- 	"{Src}alloc.c" ¶
- 	"{Src}atimer.c" ¶
- 	"{Src}buffer.c" ¶
- 	"{Src}bytecode.c" ¶
- 	"{Src}callint.c" ¶
- 	"{Src}callproc.c" ¶
- 	"{Src}casefiddle.c" ¶
- 	"{Src}casetab.c" ¶
- 	"{Src}category.c" ¶
- 	"{Src}ccl.c" ¶
- 	"{Src}charset.c" ¶
- 	"{Src}cm.c" ¶
- 	"{Src}cmds.c" ¶
- 	"{Src}coding.c" ¶
- 	"{Src}composite.c" ¶
- 	"{Src}data.c" ¶
- 	"{Src}dired.c" ¶
- 	"{Src}dispnew.c" ¶
- 	"{Src}doc.c" ¶
- 	"{Src}doprnt.c" ¶
- 	"{Src}editfns.c" ¶
- 	"{Src}emacs.c" ¶
- 	"{Src}eval.c" ¶
- 	"{Src}fileio.c" ¶
- 	"{Src}filemode.c" ¶
- 	"{Src}floatfns.c" ¶
- 	"{Src}fns.c" ¶
- 	"{Src}fontset.c" ¶
- 	"{Src}frame.c" ¶
- 	"{Src}fringe.c" ¶
- 	"{Src}getloadavg.c" ¶
- 	"{Src}image.c" ¶
- 	"{Src}indent.c" ¶
- 	"{Src}insdel.c" ¶
- 	"{Src}intervals.c" ¶
- 	"{Src}keyboard.c" ¶
- 	"{Src}keymap.c" ¶
- 	"{Src}lastfile.c" ¶
- 	"{Src}lread.c" ¶
- 	"{Src}macros.c" ¶
- 	"{Src}marker.c" ¶
- 	"{Src}minibuf.c" ¶
- 	"{Src}mktime.c" ¶
- 	"{Src}print.c" ¶
- 	"{Src}process.c" ¶
- 	"{Src}regex.c" ¶
- 	"{Src}region-cache.c" ¶
- 	"{Src}scroll.c" ¶
- 	"{Src}search.c" ¶
- 	"{Src}strftime.c" ¶
- 	"{Src}syntax.c" ¶
- 	"{Src}sysdep.c" ¶
- 	"{Src}term.c" ¶
- 	"{Src}termcap.c" ¶
- 	"{Src}textprop.c" ¶
- 	"{Src}tparam.c" ¶
- 	"{Src}undo.c" ¶
- 	"{Src}window.c" ¶
- 	"{Src}xdisp.c" ¶
- 	"{Src}xfaces.c" ¶
- 	"{Src}xmenu.c"
- 
- MacSource = ¶
- 	"{Src}mac.c" ¶
- 	"{Src}macfns.c" ¶
- 	"{Src}macterm.c"
- 
- 
- LispSource = ¶
- 	{Lisp}menu-bar.elc ¶
- 	{Lisp}mouse.elc ¶
- 	{Lisp}select.elc ¶
- 	{Lisp}scroll-bar.elc ¶
- 	{Lisp}vmsproc.elc ¶
- 	{Lisp}vms-patch.elc ¶
- 	{Lisp}ls-lisp.elc ¶
- 	{Lisp}dos-fns.elc ¶
- 	{Lisp}w32-fns.elc ¶
- 	{Lisp}dos-w32.elc ¶
- 	{Lisp}disp-table.elc ¶
- 	{Lisp}dos-vars.elc ¶
- 	{Lisp}international:ccl.elc ¶
- 	{Lisp}international:codepage.elc ¶
+ SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o ¶
+   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o ¶
+   mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o ¶
+   w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o ¶
+   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
+ 
+ shortlisp = ¶
  	{Lisp}abbrev.elc ¶
  	{Lisp}buff-menu.elc ¶
+ 	{Lisp}button.elc ¶
 +	{Lisp}server.elc ¶
  	{Lisp}emacs-lisp:byte-run.elc ¶
- 	{Lisp}cus-start.el ¶
+ 	{Lisp}cus-face.elc ¶
+ 	{Lisp}cus-start.elc ¶
  	{Lisp}custom.elc ¶
+ 	{Lisp}emacs-lisp:backquote.elc ¶
  	{Lisp}emacs-lisp:lisp-mode.elc ¶
  	{Lisp}emacs-lisp:lisp.elc ¶
  	{Lisp}facemenu.elc ¶