diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 14:56:31 +0000 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2003-02-04 14:56:31 +0000 |
commit | 177c0ea74342272645959b82cf219faa0b3dba16 (patch) | |
tree | 44e22b210a9904eab25a66d12e708804b671df75 /mac | |
parent | db95369be096960245dd38678f68464627698678 (diff) | |
download | emacs-177c0ea74342272645959b82cf219faa0b3dba16.tar.gz |
Trailing whitespace deleted.
Diffstat (limited to 'mac')
-rw-r--r-- | mac/ChangeLog | 4 | ||||
-rw-r--r-- | mac/INSTALL | 10 | ||||
-rw-r--r-- | mac/inc/config.h | 4 | ||||
-rw-r--r-- | mac/inc/m-mac.h | 2 | ||||
-rwxr-xr-x | mac/make-package | 20 | ||||
-rw-r--r-- | mac/makefile.MPW | 54 | ||||
-rw-r--r-- | mac/src/chdir.c | 2 |
7 files changed, 48 insertions, 48 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 686d0623864..113e06a911e 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -8,13 +8,13 @@ * INSTALL: Added documentation about --enable-carbon-app and changed documentation concerning Emacs.app location Removed some of the documentation about make-package that isn't - needed + needed Changed comment about requiring root permission to install to saying that it might be necessary depending on where you install Refered to /usr caveat in more places * make-package (make_options): Use new carbon_appdir option to specify directory to install Application and lets the makefile - install + install 2003-01-01 Steven Tamm <steventamm@mac.com> diff --git a/mac/INSTALL b/mac/INSTALL index 51b306c463b..1c44aa529f8 100644 --- a/mac/INSTALL +++ b/mac/INSTALL @@ -88,7 +88,7 @@ vt100|vt100-am|vt100am|dec vt100:\ :sc=\E7:rc=\E8:cs=\E[%i%d;%dr: ----- -To build the `info' files in versions prior to Mac OS X 10.2, you need +To build the `info' files in versions prior to Mac OS X 10.2, you need to install the texinfo software. To install from source, obtain texinfo-4.2.tar.gz from ftp.gnu.org or @@ -98,7 +98,7 @@ a mirror. Un-tar it, enter its directory and type make make install -The last step may need to be performed as root (sudo make install). +The last step may need to be performed as root (sudo make install). You may also like to install ispell, which will allow you to use ispell and flyspell-mode. To install ispell from source, you first @@ -110,7 +110,7 @@ Un-tar it, enter its directory, type ./configure --host=powerpc-apple-bsd make make install - + Again, the last step may need to be performed as root. Note that if you run `make check', the test for `pr' will fail. @@ -148,14 +148,14 @@ in a file called EmacsInstaller.dmg. This file can be then distributed to whomever would like a binary distribution. Here are the common options to user ---with-x - Use the X11 GUI instead of the Carbon GUI. +--with-x - Use the X11 GUI instead of the Carbon GUI. --prefix=DIR - Place the common emacs files in the given DIR. The default is /usr/local. See note below if placing in /usr --self-contained - Place the common emacs files inside the Emacs.app itself. This makes the application trivial to uninstall and copy between computers. ---app-symlink - Use a symlink inside the Application to the +--app-symlink - Use a symlink inside the Application to the $prefix/bin/emacs to reduce disk space. Note, this option may removed in the future. diff --git a/mac/inc/config.h b/mac/inc/config.h index a536ee9e877..beb8c0a6373 100644 --- a/mac/inc/config.h +++ b/mac/inc/config.h @@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */ /* No code in Emacs #includes config.h twice, but some of the code - intended to work with other packages as well (like gmalloc.c) + intended to work with other packages as well (like gmalloc.c) think they can include it as many times as they like. */ #ifndef EMACS_CONFIG_H #define EMACS_CONFIG_H @@ -41,7 +41,7 @@ Boston, MA 02111-1307, USA. */ /* Define REL_ALLOC if you want to use the relocating allocator for buffer space. */ /* #undef REL_ALLOC */ - + /* Define HAVE_X_WINDOWS if you want to use the X window system. */ /* #undef HAVE_X_WINDOWS */ diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h index 69f33a36131..9e257a3121b 100644 --- a/mac/inc/m-mac.h +++ b/mac/inc/m-mac.h @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ /* Contributed by Andrew Choi (akochoi@mac.com). */ -/* The following line tells the configuration script what sort of +/* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ diff --git a/mac/make-package b/mac/make-package index a1c10f88e2c..5529d8811e4 100755 --- a/mac/make-package +++ b/mac/make-package @@ -116,10 +116,10 @@ fi if test "$display_usage" = "yes"; then cat <<EOF -\`make-package' generates a Mac OS X installer package from an Emacs -distribution. By default, this first runs ./configure on the emacs -directory. Then make install to create the emacs distribution. -Then some mac-specific commands to generate the required information +\`make-package' generates a Mac OS X installer package from an Emacs +distribution. By default, this first runs ./configure on the emacs +directory. Then make install to create the emacs distribution. +Then some mac-specific commands to generate the required information for the mac package. The installer will, by default, create a Carbon application called Emacs in the ${appsdir} directory, with the shared emacs files in /usr/local @@ -133,7 +133,7 @@ Options: --no-conf Do not run the configure script before running make install. --without-app Do not create the Emacs application bundle - --with-x Setup the install to use X Windows for its + --with-x Setup the install to use X Windows for its windowed display, instead of carbon. Implies --without-app. --without-full-dist Do not include all the .el files in the distribution. @@ -142,10 +142,10 @@ Options: to the install in [prefix]/bin/emacs and have the emacs executable link to emacs-${version} --self-contained Create an Emacs.app that is self-contained; - prefix will be ignored and all files installed - inside the application + prefix will be ignored and all files installed + inside the application --build-in-place Build the application in the source directory - instead of a temporary directory. + instead of a temporary directory. --build-dir=DIR Build the application in the specified directory instead of a temporary directory. Mutually exclusive with --build-in-place. @@ -357,7 +357,7 @@ echo 'UseUserMask NO' >> ${infofile} echo 'OverwritePermissions NO' >> ${infofile} echo 'InstallFat NO' >> ${infofile} -### Set the install directory to install files as root... +### Set the install directory to install files as root... ### Not sure if this is a good diea # echo "Setting owner to root" # chown -Rh 0 ${tempparentfull} @@ -402,7 +402,7 @@ fi if [ ! -d /Volumes/Emacs ]; then echo "Could not create disc image. The Emacs installer package (Emacs.pkg) -in this directory should be correct. Please use the Disc Copy program to +in this directory should be correct. Please use the Disc Copy program to create a disc image." >&2 exit 0 fi diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 4ad27efb460..8e004249a09 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -2,19 +2,19 @@ # Copyright (C) 1999, 2000 Free Software Foundation, Inc. # # Author: Andrew Choi <akochoi@users.sourceforge.net> -# +# # This file is part of GNU Emacs. -# +# # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. -# +# # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -147,7 +147,7 @@ Emacs ÄÄ {Makefile} {DocTarget}DOC {EmacsObjects} {MacObjects} "{PPCLibraries}PPCToolLibs.o" ¶ -o "{EmacsTarget}" -Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r +Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r Rez -a "{Source}"Emacs.maclf.r -o "{EmacsTarget}" Rez -a "{Source}"EmacsMPW.maclf.r -o "{EmacsTarget}" SetFile "{EmacsTarget}" -t APPL -c 'EMAx' -a B @@ -373,7 +373,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}macgui.h" ¶ "{Src}frame.h" ¶ "{Src}systime.h" - + {Src}doc.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ @@ -493,7 +493,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}buffer.h" ¶ "{Src}commands.h" ¶ "{Src}keyboard.h" - + {Src}getloadavg.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" @@ -586,7 +586,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}commands.h" ¶ "{Src}keyboard.h" ¶ "{Src}termhooks.h" - + {Src}macros.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -630,7 +630,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}termchar.h" ¶ "{Src}keyboard.h" ¶ {INTERVALS_H_GROUP} - + {Src}process.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ @@ -642,7 +642,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}ccl.h" ¶ "{Src}termopts.h" ¶ "{Src}sysselect.h" - + {Src}regex.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ @@ -658,7 +658,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}lisp.h" ¶ "{Src}buffer.h" ¶ "{Src}region-cache.h" - + {Src}scroll.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}termchar.h" ¶ @@ -666,7 +666,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r {DISPEXTERN_H_GROUP} ¶ "{Src}frame.h" ¶ {WINDOW_H_GROUP} - + {Src}search.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -680,12 +680,12 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r {INTERVALS_H_GROUP} ¶ "{Includes}sys:types.h" ¶ "{Src}regex.h" - + {Src}strftime.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ - "{Includes}sys:time.h" - + "{Includes}sys:time.h" + {Src}syntax.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -695,7 +695,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}syntax.h" ¶ {INTERVALS_H_GROUP} ¶ "{Src}category.h" - + {Src}sysdep.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -737,7 +737,7 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}macterm.h" ¶ "{Src}macgui.h" ¶ "{Src}frame.h" - + {Src}termcap.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -749,17 +749,17 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r {INTERVALS_H_GROUP} ¶ "{Src}buffer.h" ¶ {WINDOW_H_GROUP} - + {Src}tparam.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" - + {Src}undo.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ "{Src}buffer.h" ¶ "{Src}commands.h" - + {Src}window.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -776,8 +776,8 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r {INTERVALS_H_GROUP} ¶ "{Src}macterm.h" ¶ "{Src}macgui.h" ¶ - "{Src}frame.h" - + "{Src}frame.h" + {Src}xdisp.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -801,8 +801,8 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}fontset.h" ¶ "{Src}macterm.h" ¶ "{Src}macgui.h" ¶ - "{Src}frame.h" - + "{Src}frame.h" + {Src}xfaces.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ @@ -907,8 +907,8 @@ Emacs ÄÄ {Makefile} "{Source}"Emacs.maclf.r "{Source}"EmacsMPW.maclf.r "{Src}termhooks.h" ¶ "{Src}coding.h" ¶ "{Src}ccl.h" - - + + #----------------------------------------# # Variables and rules for target "Clean" # #----------------------------------------# @@ -1089,7 +1089,7 @@ Doc Ä {DocTarget}DOC #-----------------------------------------------# Make-DocFile-Includes = -i :inc: -Make-DocFile-Sym = +Make-DocFile-Sym = Make-DocFile-PPCCOptions = -typecheck relaxed -w off -noMapCR ¶ {Make-DocFile-Includes} {Make-DocFile-Sym} diff --git a/mac/src/chdir.c b/mac/src/chdir.c index 987df2008bf..cfa77c8c44c 100644 --- a/mac/src/chdir.c +++ b/mac/src/chdir.c @@ -33,7 +33,7 @@ int chdir(const char *path) strcpy(mypath, path); c2pstr(mypath); - + wdpb.ioNamePtr = mypath; wdpb.ioVRefNum = 0; wdpb.ioWDDirID = 0; |