diff options
| author | Karoly Lorentey | 2004-01-24 20:03:33 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-01-24 20:03:33 +0000 |
| commit | 3bbdbec9f2dd03d81d700941e5dd40da0ec3e632 (patch) | |
| tree | b58ea13436cb07d935f1b3b2ca4e73655fa9c611 | |
| parent | 2441679b4ca544b055fe90273d1dbc22744761de (diff) | |
| download | emacs-3bbdbec9f2dd03d81d700941e5dd40da0ec3e632.tar.gz emacs-3bbdbec9f2dd03d81d700941e5dd40da0ec3e632.zip | |
Fixed interactive temacs.
src/xdisp.c (init_iterator): Always initialize the face cache if it's NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-64
| -rw-r--r-- | README.multi-tty | 8 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/README.multi-tty b/README.multi-tty index ded9c898eda..cdce445b161 100644 --- a/README.multi-tty +++ b/README.multi-tty | |||
| @@ -173,9 +173,6 @@ THINGS TO DO | |||
| 173 | > | 173 | > |
| 174 | > This also happens when I start a new frame in an xterm. | 174 | > This also happens when I start a new frame in an xterm. |
| 175 | 175 | ||
| 176 | ** Fix interactive use of temacs. There are face-related SEGVs, most | ||
| 177 | likely because of changes in realize_default_face, realize_face. | ||
| 178 | |||
| 179 | ** Very strange bug: visible-bell does not work on secondary | 176 | ** Very strange bug: visible-bell does not work on secondary |
| 180 | terminals. This might be something xterm (konsole) specific. | 177 | terminals. This might be something xterm (konsole) specific. |
| 181 | 178 | ||
| @@ -608,4 +605,9 @@ DIARY OF CHANGES | |||
| 608 | 605 | ||
| 609 | (Fixed, there was a keyboard initialization problem.) | 606 | (Fixed, there was a keyboard initialization problem.) |
| 610 | 607 | ||
| 608 | -- Fix interactive use of temacs. There are face-related SEGVs, most | ||
| 609 | likely because of changes in realize_default_face, realize_face. | ||
| 610 | |||
| 611 | (Fixed.) | ||
| 612 | |||
| 611 | ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d | 613 | ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d |
diff --git a/src/xdisp.c b/src/xdisp.c index fc09df3b49a..4b49472e1fb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2037,7 +2037,7 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id) | |||
| 2037 | attribute changes of named faces, recompute them. When running | 2037 | attribute changes of named faces, recompute them. When running |
| 2038 | in batch mode, the face cache of the initial frame is null. If | 2038 | in batch mode, the face cache of the initial frame is null. If |
| 2039 | we happen to get called, make a dummy face cache. */ | 2039 | we happen to get called, make a dummy face cache. */ |
| 2040 | if (noninteractive && FRAME_FACE_CACHE (it->f) == NULL) | 2040 | if (FRAME_FACE_CACHE (it->f) == NULL) |
| 2041 | init_frame_faces (it->f); | 2041 | init_frame_faces (it->f); |
| 2042 | if (FRAME_FACE_CACHE (it->f)->used == 0) | 2042 | if (FRAME_FACE_CACHE (it->f)->used == 0) |
| 2043 | recompute_basic_faces (it->f); | 2043 | recompute_basic_faces (it->f); |