aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/generic-x.el1
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc2d2e8b389..59dbac930b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-03-22 Andreas Schwab <schwab@suse.de>
2
3 * generic-x.el: Revert last change.
4 * ldefs-boot.el: Update.
5
12005-03-22 Jay Belanger <belanger@truman.edu> 62005-03-22 Jay Belanger <belanger@truman.edu>
2 7
3 * calc/calc-embed (calc-embedded-original-modes): New variable. 8 * calc/calc-embed (calc-embedded-original-modes): New variable.
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index a91e1db87ba..94f41c96e22 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -92,7 +92,6 @@
92 92
93;;; Code: 93;;; Code:
94 94
95(require 'generic)
96(require 'font-lock) 95(require 'font-lock)
97 96
98(defgroup generic-x nil 97(defgroup generic-x nil