aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorDan Nicolaescu2008-07-27 18:24:48 +0000
committerDan Nicolaescu2008-07-27 18:24:48 +0000
commit9e2a2647758db83b490e2993aa31cd4607305a82 (patch)
tree9c3d41b47bcd316c60d56bef8d7fd32789e59411 /doc/lispref
parent7f19297073b2dd6c28987bf5663933591f59e91e (diff)
downloademacs-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 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/display.texi6
-rw-r--r--doc/lispref/frames.texi25
-rw-r--r--doc/lispref/os.texi2
4 files changed, 10 insertions, 29 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 17b3b61f73e..168b9aef2a3 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
12008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * os.texi:
4 * frames.texi:
5 * display.texi: Remove mentions of Mac Carbon.
6
12008-07-01 Miles Bader <miles@gnu.org> 72008-07-01 Miles Bader <miles@gnu.org>
2 8
3 * text.texi (Special Properties): 9 * text.texi (Special Properties):
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index e7cb51072cc..eeed3821677 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1862,8 +1862,8 @@ apply to. Here are the possible values of @var{characteristic}:
1862@item type 1862@item type
1863The kind of window system the frame uses---either @code{graphic} (any 1863The kind of window system the frame uses---either @code{graphic} (any
1864graphics-capable display), @code{x}, @code{pc} (for the MS-DOS console), 1864graphics-capable display), @code{x}, @code{pc} (for the MS-DOS console),
1865@code{w32} (for MS Windows 9X/NT/2K/XP), @code{mac} (for the Macintosh 1865@code{w32} (for MS Windows 9X/NT/2K/XP), or @code{tty}
1866display), or @code{tty} (a non-graphics-capable display). 1866(a non-graphics-capable display).
1867@xref{Window Systems, window-system}. 1867@xref{Window Systems, window-system}.
1868 1868
1869@item class 1869@item class
@@ -5629,8 +5629,6 @@ Emacs is displaying using X.
5629Emacs is displaying using MS-DOS. 5629Emacs is displaying using MS-DOS.
5630@item w32 5630@item w32
5631Emacs is displaying using Windows. 5631Emacs is displaying using Windows.
5632@item mac
5633Emacs is displaying using a Macintosh.
5634@item nil 5632@item nil
5635Emacs is using a character-based terminal. 5633Emacs is using a character-based terminal.
5636@end table 5634@end table
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index da7d36daf96..9d42ada90e6 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -40,8 +40,6 @@ kind of display the frame uses:
40The frame is displayed in an X window. 40The frame is displayed in an X window.
41@item t 41@item t
42A terminal frame on a character display. 42A terminal frame on a character display.
43@item mac
44The frame is displayed on a Macintosh.
45@item w32 43@item w32
46The frame is displayed on MS-Windows 9X/NT. 44The frame is displayed on MS-Windows 9X/NT.
47@item pc 45@item pc
@@ -1729,33 +1727,12 @@ and @code{x-set-selection} on MS-Windows support the text data type
1729only; if the clipboard holds other types of data, Emacs treats the 1727only; if the clipboard holds other types of data, Emacs treats the
1730clipboard as empty. 1728clipboard as empty.
1731 1729
1732@cindex scrap support (for Mac OS)
1733On Mac OS, selection-like data transfer between applications is
1734performed through a mechanism called @dfn{scraps}. The clipboard is a
1735particular scrap named @code{com.apple.scrap.clipboard}. Types of scrap
1736data are called @dfn{scrap flavor types}, which are identified by
1737four-char codes such as @code{TEXT}. Emacs associates a selection with
1738a scrap, and a selection type with a scrap flavor type via
1739@code{mac-scrap-name} and @code{mac-ostype} properties, respectively.
1740
1741@example
1742(get 'CLIPBOARD 'mac-scrap-name)
1743 @result{} "com.apple.scrap.clipboard"
1744(get 'com.apple.traditional-mac-plain-text 'mac-ostype)
1745 @result{} "TEXT"
1746@end example
1747
1748Conventionally, selection types for scrap flavor types on Mac OS have
1749the form of @acronym{UTI, Uniform Type Identifier} such as
1750@code{com.apple.traditional-mac-plain-text},
1751@code{public.utf16-plain-text}, and @code{public.file-url}.
1752
1753@defopt x-select-enable-clipboard 1730@defopt x-select-enable-clipboard
1754If this is non-@code{nil}, the Emacs yank functions consult the 1731If this is non-@code{nil}, the Emacs yank functions consult the
1755clipboard before the primary selection, and the kill functions store in 1732clipboard before the primary selection, and the kill functions store in
1756the clipboard as well as the primary selection. Otherwise they do not 1733the clipboard as well as the primary selection. Otherwise they do not
1757access the clipboard at all. The default is @code{nil} on most systems, 1734access the clipboard at all. The default is @code{nil} on most systems,
1758but @code{t} on MS-Windows and Mac. 1735but @code{t} on MS-Windows.
1759@end defopt 1736@end defopt
1760 1737
1761@node Drag and Drop 1738@node Drag and Drop
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 7eb3c95e6ab..15458b87619 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -534,7 +534,7 @@ subprocess of Emacs. Then you would exit the shell to return to Emacs.
534may not have a parent that can resume it again, and in any case you can 534may not have a parent that can resume it again, and in any case you can
535give input to some other job such as a shell merely by moving to a 535give input to some other job such as a shell merely by moving to a
536different window. Therefore, suspending is not allowed when Emacs is using 536different window. Therefore, suspending is not allowed when Emacs is using
537a window system (X, MS Windows, or Mac). 537a window system (X, MS Windows).
538 538
539@defun suspend-emacs &optional string 539@defun suspend-emacs &optional string
540This function stops Emacs and returns control to the superior process. 540This function stops Emacs and returns control to the superior process.