aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-02-06 19:25:52 -0800
committerGlenn Morris2014-02-06 19:25:52 -0800
commita0baf35f681a47900561d43a2bf9d1f67732ea9c (patch)
treec87962a19aaf660d6d0e7c6533829676efefdbb9 /src
parente92e30dd30f34ac63ae23cc4e4a15a1719b07a07 (diff)
downloademacs-a0baf35f681a47900561d43a2bf9d1f67732ea9c.tar.gz
emacs-a0baf35f681a47900561d43a2bf9d1f67732ea9c.zip
* src/nsterm.m (syms_of_nsterm): Doc fix.
It is not necessary to say "default is..." since there are standard mechanisms for displaying that information.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e19b6d8781d..9efaff3d20c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-02-07 Glenn Morris <rgm@gnu.org>
2
3 * nsterm.m (syms_of_nsterm): Doc fix.
4
12014-02-06 Eli Zaretskii <eliz@gnu.org> 52014-02-06 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32.c (pMultiByteToWideChar, pWideCharToMultiByte): New 7 * w32.c (pMultiByteToWideChar, pWideCharToMultiByte): New
diff --git a/src/nsterm.m b/src/nsterm.m
index 8bb806e47c8..36f42ee179a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7645,7 +7645,7 @@ Only works on OSX 10.6 or later. */);
7645 doc: /*Non-nil means to use native fullscreen on OSX >= 10.7. 7645 doc: /*Non-nil means to use native fullscreen on OSX >= 10.7.
7646Nil means use fullscreen the old (< 10.7) way. The old way works better with 7646Nil means use fullscreen the old (< 10.7) way. The old way works better with
7647multiple monitors, but lacks tool bar. This variable is ignored on OSX < 10.7. 7647multiple monitors, but lacks tool bar. This variable is ignored on OSX < 10.7.
7648Default is t for OSX >= 10.7, nil otherwise. */); 7648Default is t for OSX >= 10.7, nil otherwise. */);
7649#ifdef HAVE_NATIVE_FS 7649#ifdef HAVE_NATIVE_FS
7650 ns_use_native_fullscreen = YES; 7650 ns_use_native_fullscreen = YES;
7651#else 7651#else
@@ -7656,7 +7656,7 @@ Default is t for OSX >= 10.7, nil otherwise. */);
7656 DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace, 7656 DEFVAR_BOOL ("ns-use-srgb-colorspace", ns_use_srgb_colorspace,
7657 doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7. 7657 doc: /*Non-nil means to use sRGB colorspace on OSX >= 10.7.
7658Note that this does not apply to images. 7658Note that this does not apply to images.
7659This variable is ignored on OSX < 10.7 and GNUstep. Default is t. */); 7659This variable is ignored on OSX < 10.7 and GNUstep. */);
7660 ns_use_srgb_colorspace = YES; 7660 ns_use_srgb_colorspace = YES;
7661 7661
7662 /* TODO: move to common code */ 7662 /* TODO: move to common code */