*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f119f89ab6c759487a4f10906fef3f20ace1031f..390b3d680f1765013a5e588d2b91dd98e55e141e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2005-04-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * term/mac-win.el: Require select.  Set selection-coding-system to
+       mac-system-coding-system.  Call menu-bar-enable-clipboard.
+       (x-last-selected-text-clipboard, x-last-selected-text-primary)
+       (x-select-enable-clipboard): New variables.
+       (x-select-text, x-get-selection, x-selection-value)
+       (x-get-selection-value, mac-select-convert-to-string)
+       (mac-services-open-file, mac-services-open-selection)
+       (mac-services-insert-text): New functions.
+       (CLIPBOARD, FIND): Put mac-scrap-name property.
+       (com.apple.traditional-mac-plain-text, public.utf16-plain-text)
+       (public.tiff): Put mac-ostype property.
+       (selection-converter-alist): Add entries for them.
+       (mac-application-menu-map): New keymap.
+       (interprogram-cut-function, interprogram-paste-function): Set to
+       x-select-text and x-get-selection-value, respectively.
+       (split-window-keep-point): Set to t.
+
 2005-04-23  Richard M. Stallman  <rms@gnu.org>
 
        * files.el (read-directory-name): Always pass non-nil

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 4d3dba217d3aa55db52a4e13c96f31015e970445..27cd5d98be91fd1b891d03edb14ef2f6aaed38f4 100644 (file)
--- 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/src/ChangeLog b/src/ChangeLog
index d5e157c70c30ed95be3ff52e68f6e5c50661d9c9..62321dc64aeccc58b0891233488238d5a5743d72 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,57 @@
+2005-04-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * Makefile.in [HAVE_CARBON] (MAC_OBJ): Add macselect.o.
+       (SOME_MACHINE_OBJECTS): Likewise.
+       (mac.o): Depend on ccl.h.
+       (macselect.o): New target.
+
+       * emacs.c (main) [MAC_OS8 || MAC_OSX && HAVE_CARBON]: Call
+       syms_of_macselect.
+
+       * frame.c (Fdelete_frame) [MAC_OS]: Call x_clear_frame_selections.
+
+       * mac.c [!TARGET_API_MAC_CARBON]: Don't include charset.h or
+       coding.h.
+       (QCLIPBOARD): Remove variable.
+       (syms_of_mac): Don't initialize it.
+       (Fmac_paste_function, Fmac_cut_function, Fx_selection_exists_p):
+       Remove functions.
+       (syms_of_mac): Don't defsubr them.
+       [TARGET_API_MAC_CARBON] (Qmime_charset, QNFD, QNFKD, QNFC, QNFKC)
+       (QHFS_plus_D, QHFS_plus_C): New variables.
+       (syms_of_mac) [TARGET_API_MAC_CARBON]: Initialize them.
+       [TARGET_API_MAC_CARBON] (get_cfstring_encoding_from_lisp)
+       (cfstring_create_normalized): New functions.
+       [TARGET_API_MAC_CARBON] (Fmac_code_convert_string): Likewise.
+       (syms_of_mac) [TARGET_API_MAC_CARBON]: Defsubr it.
+
+       * macterm.c (handling_window_update, terminate_flag): Remove
+       variables.
+       (do_window_update, do_ae_quit_application, XTread_socket): Don't
+       use them.
+       (WNE_SLEEP_AT_SUSPEND, WNE_SLEEP_AT_RESUME): Don't define.
+       [USE_CARBON_EVENTS && MAC_OSX] (mac_handle_service_event)
+       (init_service_handler): Move to macselect.c.  Remove declarations.
+       [USE_CARBON_EVENTS && MAC_OSX] (init_service_handler): Add extern.
+       (Qapplication, Qabout): New variables.
+       (syms_of_mac): Initialize them.
+       [USE_CARBON_EVENTS && MAC_OSX] (Qpreferences, Qservices, Qpaste)
+       (Qperform): New variables.
+       (syms_of_mac) [USE_CARBON_EVENTS && MAC_OSX]: Initialize them.
+       (do_get_menus) [!TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
+       (do_menu_choice): Unhighlight menu bar also when menu_id is 0.
+       (mac_store_application_menu_event, init_menu_bar): New functions.
+       [USE_CARBON_EVENTS] (mac_handle_command_event)
+       (init_command_handler): New functions.
+       (mac_handle_window_event): Return noErr on window update event.
+       (do_ae_quit_application): Call mac_store_application_menu_event.
+       (mac_initialize) [USE_CARBON_EVENTS]: Call init_command_handler
+       and init_menu_bar.
+
+       * macterm.h (x_clear_frame_selections): Add extern.
+
+       * macselect.c: New file for selection processing on Mac OS.
+
 2005-04-23  Richard M. Stallman  <rms@gnu.org>
 
        * fileio.c (Fcopy_file): New arg MUSTBENEW.