aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-03-15 01:21:39 +0000
committerChong Yidong2009-03-15 01:21:39 +0000
commitd93f95758ad8b7a68841efa078b43a609c607296 (patch)
tree68acd67dc105487e09bbe7803344c6d170da9a02
parentdf1a3e06de8f8ef2d12bf0badc5200cf0fe18a7e (diff)
downloademacs-d93f95758ad8b7a68841efa078b43a609c607296.tar.gz
emacs-d93f95758ad8b7a68841efa078b43a609c607296.zip
Fix last change.
-rw-r--r--lisp/ChangeLog10
-rw-r--r--src/ChangeLog18
2 files changed, 14 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fc093378c1..200f0c3e310 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,12 @@
12009-03-14 David Reitter <david.reitter@gmail.com> 12009-03-14 David Reitter <david.reitter@gmail.com>
2 2
3 * term/ns-win.el (ns-expand-space): remove. 3 * term/ns-win.el (ns-expand-space): Remove.
4 (ns-show-prefs event): run `customize'. 4 (ns-show-prefs event): Run `customize'.
5 (ns-power-off): run `save-buffers-kill-emacs', but ask user 5 (ns-power-off): Run `save-buffers-kill-emacs', but ask user
6 whether to save files (as is standard) 6 whether to save files (as is standard)
7 (clipboard-yank, clipboard-kill-ring-save, clipboard-kill-region) 7 (clipboard-yank, clipboard-kill-ring-save, clipboard-kill-region)
8 (menu-bar-enable-clipboard): do not undefine these. 8 (menu-bar-enable-clipboard): Do not undefine these.
9 (ns-save-preferences,ns-save-options,ns-show-preferences-help): remove. 9 (ns-save-preferences,ns-save-options,ns-show-preferences-help): Remove.
10 10
112009-03-14 Glenn Morris <rgm@gnu.org> 112009-03-14 Glenn Morris <rgm@gnu.org>
12 12
diff --git a/src/ChangeLog b/src/ChangeLog
index 551e526ba61..d1ae1373793 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,16 +1,16 @@
12009-03-14 David Reitter <david.reitter@gmail.com> 12009-03-14 David Reitter <david.reitter@gmail.com>
2 2
3 * nsterm.m (ns_shutdown_properly, -terminate): remove global state 3 * nsterm.m (ns_shutdown_properly, -terminate): Remove global state
4 variable as it was never reset 4 variable as it was never reset.
5 (ns_term_init): remove initialization of Lisp-settable defaults 5 (ns_term_init): Remove initialization of Lisp-settable defaults
6 and ns_expand_space 6 and ns_expand_space.
7 (-setPanelFromDefaultValues): remove ns_expand_space. 7 (-setPanelFromDefaultValues): Remove ns_expand_space.
8 (-showPreferencesWindow): send new KEY_NS_SHOW_PREFS key. 8 (-showPreferencesWindow): Send new KEY_NS_SHOW_PREFS key.
9 * nsfont.m (nsfont_open): remove ns_expand_space, assume -0.5 9 * nsfont.m (nsfont_open): Remove ns_expand_space, assume -0.5
10 i.e. no additional spacing, similar to Carbon port. 10 i.e. no additional spacing, similar to Carbon port.
11 11
12 * nsterm.h: define KEY_NS_SHOW_PREFS key. 12 * nsterm.h: Define KEY_NS_SHOW_PREFS key.
13 * nsfns.m (ns-popup-prefs-panel): remove. 13 * nsfns.m (ns-popup-prefs-panel): Remove.
14 14
152009-03-14 Jan Djärv <jan.h.d@swipnet.se> 152009-03-14 Jan Djärv <jan.h.d@swipnet.se>
16 16