aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2005-03-22 08:30:24 +0000
committerLute Kamstra2005-03-22 08:30:24 +0000
commite6c901b674697139ce09b924c078efbacc0552fe (patch)
treea5e15b0730c464563e0683ea8cca5721f4dae2bb
parent0c04baa6c567d68b5baebab9c28c35a5e697ef79 (diff)
downloademacs-e6c901b674697139ce09b924c078efbacc0552fe.tar.gz
emacs-e6c901b674697139ce09b924c078efbacc0552fe.zip
Require generic again.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/generic-x.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6599201913..dbf7f8169e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-03-22 Lute Kamstra <lute@gnu.org>
2
3 * generic-x.el: Require generic again.
4
12005-03-22 Miles Bader <miles@gnu.org> 52005-03-22 Miles Bader <miles@gnu.org>
2 6
3 * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled): 7 * progmodes/gdb-ui.el (breakpoint-enabled, breakpoint-disabled):
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 94f41c96e22..a91e1db87ba 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -92,6 +92,7 @@
92 92
93;;; Code: 93;;; Code:
94 94
95(require 'generic)
95(require 'font-lock) 96(require 'font-lock)
96 97
97(defgroup generic-x nil 98(defgroup generic-x nil