summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2011-11-11 01:18:32 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-11-11 01:18:32 -0800
commit22a648b4d6cfcb369730b0c41232a047fd5616fb (patch)
tree9f4beb81a2f641e00975e900fe0b9b2ddfb360f3
parent659afedebb2cdd864fee5f33c7e32eef7bc76cdf (diff)
downloademacs-22a648b4d6cfcb369730b0c41232a047fd5616fb.tar.gz
* xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 49e469b8c2f..fc1859a0ca5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-11 Dmitry Antipov <dmantipov@yandex.ru>
+
+ * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
+
2011-11-11 Kenichi Handa <handa@m17n.org>
* callproc.c (Fcall_process): Set the member dst_multibyte of
diff --git a/src/xdisp.c b/src/xdisp.c
index ae4db3906ba..dfb794f38d3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27974,7 +27974,6 @@ syms_of_xdisp (void)
DEFSYM (Qhollow, "hollow");
DEFSYM (Qhand, "hand");
DEFSYM (Qarrow, "arrow");
- DEFSYM (Qtext, "text");
DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces");
list_of_error = Fcons (Fcons (intern_c_string ("error"),