From b643362c6c88bdf5c5875afc6e0836188beabd17 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Jan 2010 19:29:36 +0100 Subject: Fix typos in ChangeLogs and NEWS files. --- src/ChangeLog.3 | 2 +- src/ChangeLog.8 | 2 +- src/ChangeLog.9 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index cf5dbd53697..fbe3f752aed 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -4776,7 +4776,7 @@ New struct face with associated typedef FACE declared, along with accessing macros. - * scroll.c (do_scrolling): Don't bcopy non-existant `nruns' or + * scroll.c (do_scrolling): Don't bcopy non-existent `nruns' or `face_list' elements. Do copy new `max_ascent' frame element. * dispnew.c (scroll_frame_lines): All references to frame elements diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index fcdf3b9bf34..de162cb39bc 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -11848,7 +11848,7 @@ * w32fns.c (w32_strict_fontnames): New variable. (Fx_create_frame): Formatting fix. - (w32_load_system_font): Keep trying to load non-existant font + (w32_load_system_font): Keep trying to load non-existent font if w32_strict_fontnames is nil. Formatting fix. (syms_of_w32fns): Add w32-strict-fontnames. diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index e4bf486aaff..b161a21eb72 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -834,7 +834,7 @@ 2001-10-02 Miles Bader * textprop.c (Fnext_char_property_change) - (Fprevious_char_property_change): Remove reference to non-existant + (Fprevious_char_property_change): Remove reference to non-existent argument OBJECT from doc-string. 2001-10-01 Gerd Moellmann -- cgit v1.2.1 From 5a89f0a793d225779f28f19b164addf81509b338 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 14 Jan 2010 19:37:23 +0100 Subject: Fix typos in comments. --- src/w32uniscribe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index cb05cd49807..f2bd0f44b50 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -22,7 +22,7 @@ along with GNU Emacs. If not, see . */ Windows 2000, though most users of older systems will have it since it installs with Internet Explorer 5.0 and other software. We only enable the feature if it is available, so there is no chance - of calling non-existant functions. */ + of calling non-existent functions. */ #undef _WIN32_WINNT #define _WIN32_WINNT 0x500 #include -- cgit v1.2.1 From 7ffdf101fbb95fce1acba91af39c9df1f3c2a053 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 14 Jan 2010 20:46:53 -0500 Subject: Fix Qnone definition in NS files. * nsterm.m (Qnone): Define here. * nsfns.m (Qnone): Move definition to nsterm.m. --- src/ChangeLog | 6 ++++++ src/nsfns.m | 4 +--- src/nsterm.m | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index e18591b345b..f5e2393724c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-01-15 Chong Yidong + + * nsterm.m (Qnone): Define. + + * nsfns.m (Qnone): Move definition to nsterm.m. + 2010-01-14 Kenichi Handa * coding.c (detect_coding_iso_2022): Fix handling of euc-xx coding diff --git a/src/nsfns.m b/src/nsfns.m index 9fdcaa47c8c..357222bb18a 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -80,8 +80,8 @@ extern Lisp_Object Qface_set_after_frame_default; extern Lisp_Object Qunderline, Qundefined; extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle; +extern Lisp_Object Qnone; -Lisp_Object Qnone; Lisp_Object Qbuffered; Lisp_Object Qfontsize; @@ -2606,8 +2606,6 @@ syms_of_nsfns () { int i; - Qnone = intern ("none"); - staticpro (&Qnone); Qfontsize = intern ("fontsize"); staticpro (&Qfontsize); diff --git a/src/nsterm.m b/src/nsterm.m index 69cece47b0e..a102267920c 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -141,8 +141,7 @@ Lisp_Object ns_input_color, ns_input_text, ns_working_text; Lisp_Object ns_input_spi_name, ns_input_spi_arg; Lisp_Object Vx_toolkit_scroll_bars; static Lisp_Object Qmodifier_value; -/* TODO: unsure why these defined in term files, anyway we need in keymap.c */ -Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper; +Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone; extern Lisp_Object Qcursor_color, Qcursor_type, Qns; /* Specifies which emacs modifier should be generated when NS receives @@ -6151,6 +6150,7 @@ syms_of_nsterm () DEFSYM (Qmeta, "meta"); DEFSYM (Qsuper, "super"); DEFSYM (Qcontrol, "control"); + DEFSYM (Qnone, "none"); Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); Fput (Qhyper, Qmodifier_value, make_number (hyper_modifier)); Fput (Qmeta, Qmodifier_value, make_number (meta_modifier)); -- cgit v1.2.1