[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/ChangeLog
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/ChangeLog |
Date: |
Fri, 28 Jan 2005 11:28:40 -0500 |
Index: emacs/src/ChangeLog
diff -c emacs/src/ChangeLog:1.4187 emacs/src/ChangeLog:1.4188
*** emacs/src/ChangeLog:1.4187 Thu Jan 27 22:32:41 2005
--- emacs/src/ChangeLog Fri Jan 28 16:28:39 2005
***************
*** 1,3 ****
--- 1,7 ----
+ 2005-01-28 Stefan Monnier <address@hidden>
+
+ * keymap.c (access_keymap): YAILOM.
+
2005-01-27 Kim F. Storm <address@hidden>
* xdisp.c (get_phys_cursor_geometry): New function to calculate
***************
*** 518,525 ****
--- 522,534 ----
(install_window_handler) [TARGET_API_MAC_CARBON]:
Register handlers for tracking/receiving drag-and-drop items.
(do_ae_open_documents): Generate unibyte strings for filenames.
+ <<<<<<< ChangeLog
+ (mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
+ Reject only non-filename items. Set event modifiers and return value.
+ =======
(mac_do_receive_drag) [TARGET_API_MAC_CARBON] : Likewise.
Reject only non-filename items. Set event modifiers, and return value.
+ >>>>>>> 1.4187
2004-12-28 Dan Nicolaescu <address@hidden>
***************
*** 629,635 ****
--- 638,649 ----
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
if the position is neither user-specified nor program-specified.
(x_free_frame_resources): Free size_hints.
+ <<<<<<< ChangeLog
+ (x_wm_set_size_hint): Allocate size_hints if needed.
+ Set size_hints.
+ =======
(x_wm_set_size_hint): Allocate size_hints if needed. Set size_hints.
+ >>>>>>> 1.4187
(mac_clear_font_name_table): New function.
(mac_do_list_fonts): Initialize font_name_table if needed.
(x_list_fonts): Don't initialize font_name_table. Add BLOCK_INPUT
***************
*** 681,687 ****
--- 695,705 ----
2004-12-27 Richard M. Stallman <address@hidden>
+ <<<<<<< ChangeLog
+ * buffer.c (Fbuffer_disable_undo): Delete (moved to simple.el).
+ =======
* buffer.c (Fbuffer_disable_undo): Delete (move to simple.el).
+ >>>>>>> 1.4187
(syms_of_buffer): Don't defsubr it.
* process.c (list_processes_1): Set undo_list instead
- [Emacs-diffs] Changes to emacs/src/ChangeLog, (continued)
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/23
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/23
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Steven Tamm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Richard M . Stallman, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/26
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Stefan Monnier, 2005/01/27
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/27
- [Emacs-diffs] Changes to emacs/src/ChangeLog,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Richard M . Stallman, 2005/01/29
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Jan Djärv, 2005/01/29
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Luc Teirlinck, 2005/01/29
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Luc Teirlinck, 2005/01/29
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Jesper Harder, 2005/01/30
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/30
- [Emacs-diffs] Changes to emacs/src/ChangeLog, Kim F . Storm, 2005/01/31