diff options
| author | Dmitry Antipov | 2011-11-11 01:18:32 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-11 01:18:32 -0800 |
| commit | 22a648b4d6cfcb369730b0c41232a047fd5616fb (patch) | |
| tree | 9f4beb81a2f641e00975e900fe0b9b2ddfb360f3 /src | |
| parent | 659afedebb2cdd864fee5f33c7e32eef7bc76cdf (diff) | |
| download | emacs-22a648b4d6cfcb369730b0c41232a047fd5616fb.tar.gz emacs-22a648b4d6cfcb369730b0c41232a047fd5616fb.zip | |
* xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
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 @@ | |||
| 1 | 2011-11-11 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. | ||
| 4 | |||
| 1 | 2011-11-11 Kenichi Handa <handa@m17n.org> | 5 | 2011-11-11 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * callproc.c (Fcall_process): Set the member dst_multibyte of | 7 | * 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) | |||
| 27974 | DEFSYM (Qhollow, "hollow"); | 27974 | DEFSYM (Qhollow, "hollow"); |
| 27975 | DEFSYM (Qhand, "hand"); | 27975 | DEFSYM (Qhand, "hand"); |
| 27976 | DEFSYM (Qarrow, "arrow"); | 27976 | DEFSYM (Qarrow, "arrow"); |
| 27977 | DEFSYM (Qtext, "text"); | ||
| 27978 | DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); | 27977 | DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); |
| 27979 | 27978 | ||
| 27980 | list_of_error = Fcons (Fcons (intern_c_string ("error"), | 27979 | list_of_error = Fcons (Fcons (intern_c_string ("error"), |