aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-27 11:46:33 +0000
committerGerd Moellmann2000-09-27 11:46:33 +0000
commit3ed365143a680d791ee74ec4de255dc42a194d73 (patch)
treeac8d44b102f433fdc3d7857515f3b2a161554a3d /lisp
parent7ecd493745ca9df70249e04f303cfb5451679f10 (diff)
downloademacs-3ed365143a680d791ee74ec4de255dc42a194d73.tar.gz
emacs-3ed365143a680d791ee74ec4de255dc42a194d73.zip
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Add assertions.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18045f7bb60..96b7be2532e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -69,7 +69,6 @@
69 * startup.el (command-line-1, fancy-splash-text): Change the 69 * startup.el (command-line-1, fancy-splash-text): Change the
70 text to sound more friendly. 70 text to sound more friendly.
71 71
72>>>>>>> 1.1138
732000-09-23 Thien-Thi Nguyen <ttn@gnu.org> 722000-09-23 Thien-Thi Nguyen <ttn@gnu.org>
74 73
75 * progmodes/hideshow.el: Update author email address. 74 * progmodes/hideshow.el: Update author email address.