Permalink
Browse files

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.
  • Loading branch information...
1 parent db165a0 commit 97256a8d472e364dce444c22130671645c4e5197 Dan Nicolaescu committed Jul 27, 2008
Showing with 269 additions and 42,429 deletions.
  1. +11 −0 ChangeLog
  2. +1 −2 INSTALL
  3. +0 −9 Makefile.in
  4. +0 −2 README
  5. +0 −5 admin/CPP-DEFINES
  6. +7 −0 admin/ChangeLog
  7. +2 −0 admin/FOR-RELEASE
  8. +1 −58 admin/admin.el
  9. +1 −2 admin/make-tarball.txt
  10. +3 −334 configure
  11. +4 −51 configure.in
  12. +4 −0 doc/emacs/ChangeLog
  13. +2 −3 doc/emacs/xresources.texi
  14. +6 −0 doc/lispref/ChangeLog
  15. +2 −4 doc/lispref/display.texi
  16. +1 −24 doc/lispref/frames.texi
  17. +1 −1 doc/lispref/os.texi
  18. +5 −0 doc/misc/ChangeLog
  19. +2 −6 doc/misc/faq.texi
  20. +1 −2 doc/misc/ns-emacs.texi
  21. +5 −0 etc/ChangeLog
  22. +1 −2 etc/MACHINES
  23. +0 −30 etc/PROBLEMS
  24. +6 −0 lib-src/ChangeLog
  25. +1 −1 lib-src/emacsclient.c
  26. +1 −1 lib-src/makefile.w32-in
  27. +21 −0 lisp/ChangeLog
  28. +0 −1 lisp/Makefile.in
  29. +3 −14 lisp/cus-edit.el
  30. +1 −1 lisp/cus-face.el
  31. +0 −38 lisp/cus-start.el
  32. +4 −4 lisp/disp-table.el
  33. +4 −0 lisp/erc/ChangeLog
  34. +0 −1 lisp/erc/erc.el
  35. +10 −10 lisp/faces.el
  36. +17 −17 lisp/frame.el
  37. +1 −1 lisp/info.el
  38. +2 −16 lisp/international/mule-cmds.el
  39. +0 −2 lisp/isearch.el
  40. +0 −3 lisp/loadup.el
  41. +1 −1 lisp/mouse.el
  42. +2 −2 lisp/mwheel.el
  43. +1 −2 lisp/simple.el
  44. +1 −1 lisp/startup.el
  45. +0 −2,002 lisp/term/mac-win.el
  46. +0 −2 lisp/version.el
  47. +0 −674 mac/COPYING
  48. +0 −990 mac/ChangeLog
  49. +0 −2 mac/Emacs.app/Contents/.cvsignore
  50. +0 −571 mac/Emacs.app/Contents/Info.plist
  51. +0 −1 mac/Emacs.app/Contents/PkgInfo
  52. BIN mac/Emacs.app/Contents/Resources/Emacs.icns
  53. +0 −5 mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
  54. BIN mac/Emacs.app/Contents/Resources/document.icns
  55. +0 −196 mac/INSTALL
  56. +0 −52 mac/README
  57. +0 −443 mac/make-package
  58. +0 −734 mac/src/Emacs.r
  59. +0 −46 mac/src/chdir.c
  60. +2 −25 make-dist
  61. +43 −0 src/ChangeLog
  62. +8 −62 src/Makefile.in
  63. +0 −6 src/atimer.c
  64. +2 −12 src/config.in
  65. +1 −16 src/dispextern.h
  66. +0 −14 src/dispnew.c
  67. +3 −51 src/emacs.c
  68. +1 −1 src/fileio.c
  69. +0 −5 src/fns.c
  70. +0 −7 src/font.c
  71. +0 −3 src/font.h
  72. +0 −3 src/fontset.c
  73. +2 −17 src/frame.c
  74. +4 −8 src/frame.h
  75. +2 −18 src/fringe.c
  76. +32 −1,021 src/image.c
  77. +8 −38 src/keyboard.c
  78. +2 −22 src/lisp.h
  79. +3 −7 src/lread.c
  80. +1 −1 src/m/intel386.h
  81. +0 −5,477 src/mac.c
  82. +0 −4,429 src/macfns.c
  83. +0 −496 src/macgui.h
  84. +0 −2,101 src/macmenu.c
  85. +0 −1,165 src/macselect.c
  86. +0 −13,451 src/macterm.c
  87. +0 −795 src/macterm.h
  88. +0 −6,615 src/mactoolbox.c
  89. +1 −1 src/process.c
  90. +4 −57 src/s/darwin.h
  91. +0 −9 src/sysdep.c
  92. +2 −2 src/sysselect.h
  93. +1 −1 src/syssignal.h
  94. +0 −3 src/term.c
  95. +0 −16 src/termcap.c
  96. +1 −16 src/termhooks.h
  97. +0 −4 src/tparam.c
  98. +0 −3 src/window.c
  99. +9 −26 src/xdisp.c
  100. +1 −56 src/xfaces.c
View
@@ -1,3 +1,14 @@
+2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
+
+ Remove support for Mac Carbon.
+ * mac: Remove directory.
+ * make-dist:
+ * configure.in:
+ * README:
+ * Makefile.in:
+ * INSTALL: Remove code for Carbon.
+ * configure: Regenerate.
+
2008-07-26 Adrian Robert <Adrian.B.Robert@gmail.com>
* Makefile.in (install-arch-dep): Fix typo in NS installation
View
@@ -223,8 +223,7 @@ DETAILED BUILDING AND INSTALLATION:
(This is for a Unix or Unix-like system. For MS-DOS and Windows 3.X,
see below; search for MSDOG. For Windows 9X, Windows ME, Windows NT,
-and Windows 2000, see the file nt/INSTALL. For the Mac, see the file
-mac/INSTALL.)
+and Windows 2000, see the file nt/INSTALL.)
1) Make sure your system has enough swapping space allocated to handle
a program whose pure code is 1.5 MB and whose data area is at
View
@@ -164,9 +164,6 @@ VPATH=@srcdir@
# Where to find the application default.
x_default_search_path=@x_default_search_path@
-# Location to install Emacs.app on Mac OS X
-carbon_appdir=@carbon_appdir@
-
# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
ns_appdir=@ns_appdir@
ns_appbindir=@ns_appbindir@
@@ -410,12 +407,6 @@ install-arch-dep: mkdir
${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
else true; fi ; \
done
- if test "${carbon_appdir}" != ""; then \
- umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \
- (cd mac/Emacs.app; (tar -chf - . | \
- (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
- && cat > /dev/null))) || exit 1; \
- fi
if test "${ns_appdir}" != ""; then \
( cd ${ns_appresdir} ; \
if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
View
@@ -84,8 +84,6 @@ There are several subdirectories:
`vms' holds instructions and useful files for running Emacs under VMS.
`nt' holds various command files and documentation files that pertain
to building and running Emacs on Windows 9X/ME/NT/2000/XP.
-`mac' holds instructions, sources, and other useful files for building
- and running Emacs on the Mac.
`test' holds tests for various aspects of Emacs's functionality.
Building Emacs on non-Posix platforms requires to install tools
View
@@ -3,8 +3,6 @@ of their use. Feel free to add more macros and more categories.
** Distinguishing OSes **
-MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed.
-MAC_OSX Compiling for Mac OS X. Not bare Darwin.
CYGWIN Compiling the Cygwin port.
__CYGWIN__ Ditto
MSDOS Compiling the MS-DOS port.
@@ -21,8 +19,6 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst
** Distinguishing GUIs **
HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars.
-MAC_OS Compiling for the `mac' window-system.
-HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS?
HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API.
NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
@@ -38,7 +34,6 @@ USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11.
FRAME_TERMCAP_P A tty (character terminal) frame.
FRAME_X_P A frame on X Window system.
FRAME_MSDOS_P An MS-DOS frame (used only by the DOS port).
-FRAME_MAC_P A Mac frame.
FRAME_W32_P A frame using native MS-Windows GUI.
FRAME_WINDOW_P A GUI frame (like X, w32, etc.)
View
@@ -1,3 +1,10 @@
+2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * make-tarball.txt:
+ * admin.el:
+ * FOR-RELEASE:
+ * CPP-DEFINES: Remove mentions of Mac Carbon.
+
2008-07-16 Glenn Morris <rgm@gnu.org>
* admin.el (set-version, set-copyright): Add nextstep/ files.
View
@@ -125,6 +125,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00951.html
* DOCUMENTATION
+** Verify if doc/emacs/macos.texi is still useful, remove it if it is not.
+
** Document multi-tty features
http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01639.html
http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01602.html
View
@@ -123,43 +123,7 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "nt/emacs.rc" comma-space-version
(rx (and "\"ProductVersion\"" (0+ space) ?,
(0+ space) ?\" (submatch (1+ (in "0-9, ")))
- "\\0\"")))
- ;; Some files in the "mac" subdirectory also contain the version
- ;; number.
- (set-version-in-file
- root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
- version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\"
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file
- root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
- version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
- (submatch (1+ (in "0-9."))))))
- (set-version-in-file root "mac/src/Emacs.r" (car version-components)
- (rx (and "GNU Emacs " (submatch (1+ (in "0-9")))
- " for Mac OS")))
- (set-version-in-file root "mac/src/Emacs.r" (car version-components)
- (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
- (0+ space) "/* Major revision in BCD */")))
- (set-version-in-file root "mac/src/Emacs.r" (cadr version-components)
- (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
- (0+ space) "/* Minor revision in BCD */")))
- (set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components))
- (rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
- (0+ space) "/* Non-final release # */")))
- (set-version-in-file root "mac/src/Emacs.r" version
- (rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\,
- (0+ space) "/* Short version number */")))
- (set-version-in-file root "mac/src/Emacs.r" version
- (rx (and "/* Short version number */" (0+ space) ?\"
- (submatch (1+ (in "0-9."))))))
- (let* ((third-component (string-to-number (cadr (cdr version-components))))
- (release (cond ((>= third-component 90) "alpha")
- ((>= third-component 50) "development")
- (t "final"))))
- (set-version-in-file
- root "mac/src/Emacs.r" release
- (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space)
- "/* development, alpha, beta, or final (release) */")))))
+ "\\0\""))))
;; nextstep.
(set-version-in-file
root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
@@ -211,29 +175,8 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "lib-src/rcs2log" copyright
(rx (and "Copyright" (0+ space) ?= (0+ space)
?\' (submatch (1+ nonl)))))
- (set-version-in-file
- root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
- copyright (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
- (1+ anything)
- (submatch "Copyright" (1+ (not (in ?\")))))))
;; This one is a nuisance, as it needs to be split over two lines.
(string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
- (let ((csign "\\0xa9")
- (cyear (match-string 1 copyright)) ; "Copyright (C) 2007 "
- (owner (match-string 2 copyright))) ; "Free Software Foundation, Inc."
- (set-version-in-file root "mac/src/Emacs.r"
- (regexp-quote
- (replace-regexp-in-string "(C)"
- (regexp-quote csign) cyear))
- (rx (and
- (submatch "Copyright" (0+ space) (eval csign)
- (0+ space) (= 4 num)
- (0+ (not (in ?\")))) ?\")))
- (set-version-in-file root "mac/src/Emacs.r" owner
- (rx (and ?\"
- (submatch (1+ (not (in ?\"))))
- ?\" (0+ space)
- "/* Long version number */"))))
;; nextstep.
(set-version-in-file
root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
@@ -23,8 +23,7 @@ For each step, check for possible errors.
6. Commit configure, README, doc/emacs/emacs.texi,
doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,
- mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
- mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to
+ nt/emacs.rc. Copy lisp/loaddefs.el to
lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release,
also commit the ChangeLog files in all directories.
Oops, something went wrong.

0 comments on commit 97256a8

Please sign in to comment.