diff options
| author | Gerd Moellmann | 2001-03-27 16:52:09 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-03-27 16:52:09 +0000 |
| commit | 0245398f1d9dc305f9414193a2fdb84cfb3601b6 (patch) | |
| tree | fd30afa448d9db407ea52ad8d9fa2d58fba16da2 /src | |
| parent | aba253484f6749ca14e996045c25a4f2d38c299a (diff) | |
| download | emacs-0245398f1d9dc305f9414193a2fdb84cfb3601b6.tar.gz emacs-0245398f1d9dc305f9414193a2fdb84cfb3601b6.zip | |
(init_from_display_pos): Remove unwarranted assertion.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd955df30cf..aab2d0a8d6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2001-03-27 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-03-27 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (init_from_display_pos): Remove unwarranted assertion. | ||
| 4 | |||
| 3 | * xmenu.c (free_frame_menubar) [USE_MOTIF]: If the shell widget's | 5 | * xmenu.c (free_frame_menubar) [USE_MOTIF]: If the shell widget's |
| 4 | x/y position is (0, 0) after destroying the menu bar, restore | 6 | x/y position is (0, 0) after destroying the menu bar, restore |
| 5 | its original position. | 7 | its original position. |
diff --git a/src/xdisp.c b/src/xdisp.c index 5dc97d0775f..bd6a07e05d0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1810,7 +1810,6 @@ init_from_display_pos (it, w, pos) | |||
| 1810 | but the call to init_iterator below will move us to the | 1810 | but the call to init_iterator below will move us to the |
| 1811 | after-string. */ | 1811 | after-string. */ |
| 1812 | init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID); | 1812 | init_iterator (it, w, charpos, bytepos, NULL, DEFAULT_FACE_ID); |
| 1813 | xassert (IT_CHARPOS (*it) == CHARPOS (pos->pos)); | ||
| 1814 | 1813 | ||
| 1815 | /* If position is within an overlay string, set up IT to | 1814 | /* If position is within an overlay string, set up IT to |
| 1816 | the right overlay string. */ | 1815 | the right overlay string. */ |