[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109547: Define Qnone once for all pl
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109547: Define Qnone once for all platforms. |
Date: |
Fri, 10 Aug 2012 13:24:03 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109547
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 13:24:03 +0400
message:
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.
modified:
src/ChangeLog
src/frame.c
src/lisp.h
src/nsfns.m
src/nsterm.h
src/nsterm.m
src/w32fns.c
src/w32font.c
src/xfns.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-10 09:04:19 +0000
+++ b/src/ChangeLog 2012-08-10 09:24:03 +0000
@@ -1,5 +1,14 @@
2012-08-10 Dmitry Antipov <address@hidden>
+ 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 <address@hidden>
+
Remove unused macros from intervals.h.
* intervals.h (MERGE_INSERTIONS, DISPLAY_INVISIBLE_GLYPH): Remove.
* intervals.c: Adjust comment.
=== modified file 'src/frame.c'
--- a/src/frame.c 2012-08-07 07:33:18 +0000
+++ b/src/frame.c 2012-08-10 09:24:03 +0000
@@ -65,7 +65,7 @@
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 @@
DEFSYM (Qminibuffer, "minibuffer");
DEFSYM (Qmodeline, "modeline");
DEFSYM (Qonly, "only");
+ DEFSYM (Qnone, "none");
DEFSYM (Qwidth, "width");
DEFSYM (Qgeometry, "geometry");
DEFSYM (Qicon_left, "icon-left");
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-08-10 00:02:10 +0000
+++ b/src/lisp.h 2012-08-10 09:24:03 +0000
@@ -3128,7 +3128,7 @@
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);
=== modified file 'src/nsfns.m'
--- a/src/nsfns.m 2012-08-07 07:33:18 +0000
+++ b/src/nsfns.m 2012-08-10 09:24:03 +0000
@@ -82,7 +82,6 @@
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;
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2012-07-13 18:03:10 +0000
+++ b/src/nsterm.h 2012-08-10 09:24:03 +0000
@@ -735,7 +735,6 @@
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);
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2012-08-07 07:33:18 +0000
+++ b/src/nsterm.m 2012-08-10 09:24:03 +0000
@@ -139,7 +139,7 @@
};
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 @@
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));
=== modified file 'src/w32fns.c'
--- a/src/w32fns.c 2012-08-10 07:16:58 +0000
+++ b/src/w32fns.c 2012-08-10 09:24:03 +0000
@@ -93,7 +93,6 @@
static int w32_in_use;
-Lisp_Object Qnone;
Lisp_Object Qsuppress_icon;
Lisp_Object Qundefined_color;
Lisp_Object Qcancel_timer;
@@ -6808,7 +6807,6 @@
w32_visible_system_caret_hwnd = NULL;
- DEFSYM (Qnone, "none");
DEFSYM (Qsuppress_icon, "suppress-icon");
DEFSYM (Qundefined_color, "undefined-color");
DEFSYM (Qcancel_timer, "cancel-timer");
=== modified file 'src/w32font.c'
--- a/src/w32font.c 2012-07-29 08:18:29 +0000
+++ b/src/w32font.c 2012-08-10 09:24:03 +0000
@@ -62,7 +62,6 @@
static Lisp_Object Qraster, Qoutline, Qunknown;
/* antialiasing */
-extern Lisp_Object Qnone; /* reuse from w32fns.c */
static Lisp_Object Qstandard, Qsubpixel, Qnatural;
/* languages */
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2012-08-07 07:33:18 +0000
+++ b/src/xfns.c 2012-08-10 09:24:03 +0000
@@ -130,7 +130,6 @@
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 @@
/* 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");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109547: Define Qnone once for all platforms.,
Dmitry Antipov <=