From: Dmitry Antipov Date: Fri, 10 Aug 2012 09:24:03 +0000 (+0400) Subject: Define Qnone once for all platforms. X-Git-Tag: emacs-24.2.90~742 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fb0c957319ac71aca7b668bd3ee781590f59b19;p=emacs.git Define Qnone once for all platforms. * frame.c (Qnone): Define here. (syms_of_frame): DEFSYM it. * lisp.h (Qnone): New declaration. * nsfns.m, nsterm.h, nsterm.m, w32fns.c, w32font.c: * xfns.c: Remove duplication. Adjust users. --- diff --git a/src/ChangeLog b/src/ChangeLog index 79dcf0bbaa6..ec53ff2a264 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2012-08-10 Dmitry Antipov + + Define Qnone once for all platforms. + * frame.c (Qnone): Define here. + (syms_of_frame): DEFSYM it. + * lisp.h (Qnone): New declaration. + * nsfns.m, nsterm.h, nsterm.m, w32fns.c, w32font.c: + * xfns.c: Remove duplication. Adjust users. + 2012-08-10 Dmitry Antipov Remove unused macros from intervals.h. diff --git a/src/frame.c b/src/frame.c index 2a2a8576a2b..09049ddae72 100644 --- a/src/frame.c +++ b/src/frame.c @@ -65,7 +65,7 @@ Lisp_Object Qns_parse_geometry; Lisp_Object Qframep, Qframe_live_p; Lisp_Object Qicon, Qmodeline; -Lisp_Object Qonly; +Lisp_Object Qonly, Qnone; Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; Lisp_Object Qvisible; Lisp_Object Qdisplay_type; @@ -4202,6 +4202,7 @@ syms_of_frame (void) DEFSYM (Qminibuffer, "minibuffer"); DEFSYM (Qmodeline, "modeline"); DEFSYM (Qonly, "only"); + DEFSYM (Qnone, "none"); DEFSYM (Qwidth, "width"); DEFSYM (Qgeometry, "geometry"); DEFSYM (Qicon_left, "icon-left"); diff --git a/src/lisp.h b/src/lisp.h index 4f1a8931e99..e23093f56c9 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3128,7 +3128,7 @@ extern int indented_beyond_p (ptrdiff_t, ptrdiff_t, EMACS_INT); extern void syms_of_indent (void); /* Defined in frame.c. */ -extern Lisp_Object Qonly; +extern Lisp_Object Qonly, Qnone; extern Lisp_Object Qvisible; extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); diff --git a/src/nsfns.m b/src/nsfns.m index a19cbfb657c..0b639d6269c 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -82,7 +82,6 @@ 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 Qbuffered; diff --git a/src/nsterm.h b/src/nsterm.h index b20621a53d7..de41929e3fd 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -735,7 +735,6 @@ extern Lisp_Object ns_get_local_selection (Lisp_Object selection_name, extern void nxatoms_of_nsselect (void); extern int ns_lisp_to_cursor_type (Lisp_Object arg); extern Lisp_Object ns_cursor_type_to_lisp (int arg); -extern Lisp_Object Qnone; extern void ns_set_name_as_filename (struct frame *f); extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg); diff --git a/src/nsterm.m b/src/nsterm.m index 4d3a1387259..807ff564213 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -139,7 +139,7 @@ static unsigned convert_ns_to_X_keysym[] = }; static Lisp_Object Qmodifier_value; -Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper, Qnone; +Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper; extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; static Lisp_Object QUTF8_STRING; @@ -6706,7 +6706,6 @@ syms_of_nsterm (void) DEFSYM (Qmeta, "meta"); DEFSYM (Qsuper, "super"); DEFSYM (Qcontrol, "control"); - DEFSYM (Qnone, "none"); DEFSYM (QUTF8_STRING, "UTF8_STRING"); Fput (Qalt, Qmodifier_value, make_number (alt_modifier)); diff --git a/src/w32fns.c b/src/w32fns.c index 53dcb4bac96..1464f867077 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -93,7 +93,6 @@ static HWND hourglass_hwnd = NULL; static int w32_in_use; -Lisp_Object Qnone; Lisp_Object Qsuppress_icon; Lisp_Object Qundefined_color; Lisp_Object Qcancel_timer; @@ -6808,7 +6807,6 @@ syms_of_w32fns (void) w32_visible_system_caret_hwnd = NULL; - DEFSYM (Qnone, "none"); DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcancel_timer, "cancel-timer"); diff --git a/src/w32font.c b/src/w32font.c index fd24a90d60b..59dab789ab7 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -62,7 +62,6 @@ static Lisp_Object Qserif, Qscript, Qdecorative; static Lisp_Object Qraster, Qoutline, Qunknown; /* antialiasing */ -extern Lisp_Object Qnone; /* reuse from w32fns.c */ static Lisp_Object Qstandard, Qsubpixel, Qnatural; /* languages */ diff --git a/src/xfns.c b/src/xfns.c index b4d3e84602e..26c96e99c0f 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -130,7 +130,6 @@ extern LWLIB_ID widget_id_tick; int x_in_use; -static Lisp_Object Qnone; static Lisp_Object Qsuppress_icon; static Lisp_Object Qundefined_color; static Lisp_Object Qcompound_text, Qcancel_timer; @@ -5814,7 +5813,6 @@ syms_of_xfns (void) /* The section below is built by the lisp expression at the top of the file, just above where these variables are declared. */ /*&&& init symbols here &&&*/ - DEFSYM (Qnone, "none"); DEFSYM (Qsuppress_icon, "suppress-icon"); DEFSYM (Qundefined_color, "undefined-color"); DEFSYM (Qcompound_text, "compound-text");