diff options
| author | Dan Nicolaescu | 2008-07-27 18:24:48 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-27 18:24:48 +0000 |
| commit | 9e2a2647758db83b490e2993aa31cd4607305a82 (patch) | |
| tree | 9c3d41b47bcd316c60d56bef8d7fd32789e59411 /src/lread.c | |
| parent | 7f19297073b2dd6c28987bf5663933591f59e91e (diff) | |
| download | emacs-9e2a2647758db83b490e2993aa31cd4607305a82.tar.gz emacs-9e2a2647758db83b490e2993aa31cd4607305a82.zip | |
Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon
* erc.el: Remove code for Carbon.
Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.
Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.
* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.
* xresources.texi: Remove mentions of Mac Carbon.
* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.
Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL: Remove code for Carbon.
* configure: Regenerate.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lread.c b/src/lread.c index 6ec8dff6cfd..872b6cfc2fc 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4095,15 +4095,11 @@ init_lread () | |||
| 4095 | } | 4095 | } |
| 4096 | #endif | 4096 | #endif |
| 4097 | 4097 | ||
| 4098 | #if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)) || (defined(HAVE_NS)))) | 4098 | #if (!(defined(WINDOWSNT) || (defined(HAVE_NS)))) |
| 4099 | /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is | 4099 | /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is |
| 4100 | almost never correct, thereby causing a warning to be printed out that | 4100 | almost never correct, thereby causing a warning to be printed out that |
| 4101 | confuses users. Since PATH_LOADSEARCH is always overridden by the | 4101 | confuses users. Since PATH_LOADSEARCH is always overridden by the |
| 4102 | EMACSLOADPATH environment variable below, disable the warning on NT. | 4102 | EMACSLOADPATH environment variable below, disable the warning on NT. */ |
| 4103 | Also, when using the "self-contained" option for Carbon Emacs for MacOSX, | ||
| 4104 | the "standard" paths may not exist and would be overridden by | ||
| 4105 | EMACSLOADPATH as on NT. Since this depends on how the executable | ||
| 4106 | was build and packaged, turn off the warnings in general */ | ||
| 4107 | 4103 | ||
| 4108 | /* Warn if dirs in the *standard* path don't exist. */ | 4104 | /* Warn if dirs in the *standard* path don't exist. */ |
| 4109 | if (!turn_off_warning) | 4105 | if (!turn_off_warning) |
| @@ -4125,7 +4121,7 @@ init_lread () | |||
| 4125 | } | 4121 | } |
| 4126 | } | 4122 | } |
| 4127 | } | 4123 | } |
| 4128 | #endif /* !(WINDOWSNT || HAVE_CARBON || HAVE_NS) */ | 4124 | #endif /* !(WINDOWSNT || HAVE_NS) */ |
| 4129 | 4125 | ||
| 4130 | /* If the EMACSLOADPATH environment variable is set, use its value. | 4126 | /* If the EMACSLOADPATH environment variable is set, use its value. |
| 4131 | This doesn't apply if we're dumping. */ | 4127 | This doesn't apply if we're dumping. */ |