aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Tamm2005-04-14 04:22:48 +0000
committerSteven Tamm2005-04-14 04:22:48 +0000
commit0614c575850d7b93ff2064a08e54005e21677289 (patch)
treee4b909badf7e984a6eee213fc8c7f6298fa58dab /src
parent24531f226fb1150c3a52a3ebf9273d1af36062ea (diff)
downloademacs-0614c575850d7b93ff2064a08e54005e21677289.tar.gz
emacs-0614c575850d7b93ff2064a08e54005e21677289.zip
macterm.c (syms_of_macterm): Removing redundant definition of
mac-pass-control-to-system
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macterm.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9a439dff8ca..08ee33d40e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-04-13 Steven Tamm <steventamm@mac.com>
2
3 * macterm.c (syms_of_macterm): Removing redundant definition of
4 mac-pass-control-to-system
5
12005-04-12 Stefan Monnier <monnier@iro.umontreal.ca> 62005-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * window.c (Fset_window_configuration): Be careful when you choose 8 * window.c (Fset_window_configuration): Be careful when you choose
diff --git a/src/macterm.c b/src/macterm.c
index c77bcba6d0c..2ac16596cfa 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9829,10 +9829,6 @@ Toolbox for processing before Emacs sees it. */);
9829Toolbox for processing before Emacs sees it. */); 9829Toolbox for processing before Emacs sees it. */);
9830 Vmac_pass_control_to_system = Qt; 9830 Vmac_pass_control_to_system = Qt;
9831 9831
9832 DEFVAR_LISP ("mac-pass-control-to-system", &Vmac_pass_control_to_system,
9833 doc: /* If non-nil, the Mac \"Control\" key is passed on to the Mac
9834Toolbox for processing before Emacs sees it. */);
9835 Vmac_pass_control_to_system = Qt;
9836#endif 9832#endif
9837 9833
9838 DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics, 9834 DEFVAR_LISP ("mac-allow-anti-aliasing", &Vmac_use_core_graphics,