diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-25 11:49:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-25 11:49:38 +0000 |
| commit | 351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6 (patch) | |
| tree | b487571bcab596eefd9c6049e9d9354e8ec0ac67 /mac | |
| parent | 5ad1bc4dead80db3e81a6855714bc0b5817f5fc0 (diff) | |
| parent | 61b397cdc2019424c47f1fc5571fc127e2ed747d (diff) | |
| download | emacs-351c9889873cb0e8c4e43bc51f9a5b36b81ac9a6.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 67, 270-278)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-270
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-271
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-272
src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-273
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-275
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-276
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-277
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-278
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-67
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-332
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/ChangeLog | 10 | ||||
| -rw-r--r-- | mac/Emacs.app/Contents/Info.plist | 41 | ||||
| -rw-r--r-- | mac/inc/s-mac.h | 2 | ||||
| -rw-r--r-- | mac/makefile.MPW | 18 |
4 files changed, 70 insertions, 1 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 4d3dba217d3..27cd5d98be9 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,13 @@ +2005-04-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * makefile.MPW (MacObjects): Add macselect.c.x. + (macselect.c.x): New target. + (mac.c): Fix dependency. + + * Emacs.app/Contents/Info.plist: Add NSServices key and data. + + * inc/s-mac.h: Define HAVE_PWD_H. + 2005-04-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * makefile.MPW (NonCarbonLibs): Add LocalesLib. Delete diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist index afcf6cc3423..7f79e8f6ab0 100644 --- a/mac/Emacs.app/Contents/Info.plist +++ b/mac/Emacs.app/Contents/Info.plist @@ -35,5 +35,46 @@ <string>EMAx</string> <key>CFBundleVersion</key> <string>1.1</string> + <key>NSServices</key> + <array> + <dict> + <key>NSKeyEquivalent</key> + <dict/> + <key>NSMenuItem</key> + <dict> + <key>default</key> + <string>Emacs/Open Selected File</string> + </dict> + <key>NSMessage</key> + <string>open-file</string> + <key>NSPortName</key> + <string>Emacs</string> + <key>NSReturnTypes</key> + <array/> + <key>NSSendTypes</key> + <array> + <string>NSStringPboardType</string> + </array> + </dict> + <dict> + <key>NSKeyEquivalent</key> + <dict/> + <key>NSMenuItem</key> + <dict> + <key>default</key> + <string>Emacs/New Buffer Containing Selection</string> + </dict> + <key>NSMessage</key> + <string>open-selection</string> + <key>NSPortName</key> + <string>Emacs</string> + <key>NSReturnTypes</key> + <array/> + <key>NSSendTypes</key> + <array> + <string>NSStringPboardType</string> + </array> + </dict> + </array> </dict> </plist> diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h index a9108a67ca5..56f4df5941c 100644 --- a/mac/inc/s-mac.h +++ b/mac/inc/s-mac.h @@ -96,6 +96,8 @@ Boston, MA 02111-1307, USA. */ /* #define HAVE_PTYS */ +#define HAVE_PWD_H 1 + /* * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate * The 4.2 opendir, etc., library functions. diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 5e0a6e1d890..2f1d6750a98 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -133,6 +133,7 @@ MacObjects = ¶ "{Src}mac.c.x" ¶ "{Src}macfns.c.x" ¶ "{Src}macmenu.c.x" ¶ + "{Src}macselect.c.x" ¶ "{Src}macterm.c.x" StdLibraries = ¶ @@ -881,6 +882,14 @@ NonCarbon Ä "{Includes}sys:types.h" ¶ {DISPEXTERN_H_GROUP} +{Src}macselect.c.x Ä ¶ + {CONFIG_H_GROUP} ¶ + "{Src}lisp.h" ¶ + "{Src}macterm.h" ¶ + "{Src}macgui.h" ¶ + "{Src}frame.h" ¶ + {BLOCKINPUT_H_GROUP} + {Src}mac.c Ä ¶ {CONFIG_H_GROUP} ¶ "{Includes}utime.h" ¶ @@ -895,7 +904,14 @@ NonCarbon Ä "{Src}sysselect.h" ¶ "{Src}systime.h" ¶ "{Includes}sys:time.h" ¶ - "{Includes}utsname.h" + "{Includes}utsname.h" ¶ + "{Src}macterm.h" ¶ + "{Src}macgui.h" ¶ + "{Src}frame.h" ¶ + {BLOCKINPUT_H_GROUP} ¶ + "{Src}charset.h" ¶ + "{Src}coding.h" ¶ + "{Src}ccl.h" {Src}macfns.c Ä ¶ {CONFIG_H_GROUP} ¶ |