diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 24 | ||||
| -rw-r--r-- | src/macterm.h | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 69bc634be06..a32ed4158f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,27 @@ +2005-12-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macterm.h (TYPE_FILE_NAME): New define. + (posix_pathname_to_fsspec, fsspec_to_posix_pathname): Remove externs. + + * mac.c (posix_pathname_to_fsspec, fsspec_to_posix_pathname): Add + prototypes. Make static. + (mac_aedesc_to_lisp): Initialize err to noErr. + (mac_coerce_file_name_ptr, mac_coerce_file_name_desc) + (init_coercion_handler): New functions. + (Fmac_coerce_ae_data): Use coercion of Apple event data for + translation from/to file names. + + * macterm.c: Don't include sys/param.h. + (init_coercion_handler): Add extern. + [MAC_OS8] (main): Call init_coercion_handler. + (mac_initialize) [MAC_OSX]: Likewise. + [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Use coercion of + Apple event data for translation from/to file names. + + * macfns.c [TARGET_API_MAC_CARBON] (Fx_file_dialog): Likewise. + + * image.c [MAC_OS] (find_image_fsspec): Likewise. + 2005-12-23 Martin Rudalics <rudalics@gmx.at> (tiny change) * insdel.c (insert, insert_and_inherit, insert_before_markers) diff --git a/src/macterm.h b/src/macterm.h index fb9651312cd..458fe63e5df 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -569,14 +569,14 @@ extern Lisp_Object mac_make_lispy_event_code P_ ((int)); #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 +#define TYPE_FILE_NAME 'fNam' + /* Defined in macselect.c */ extern void x_clear_frame_selections P_ ((struct frame *)); /* Defined in mac.c. */ -extern OSErr posix_pathname_to_fsspec P_ ((const char *, FSSpec *)); -extern OSErr fsspec_to_posix_pathname P_ ((const FSSpec *, char *, int)); extern void mac_clear_font_name_table P_ ((void)); extern Lisp_Object mac_aedesc_to_lisp P_ ((AEDesc *)); #if TARGET_API_MAC_CARBON |