diff options
| author | Dan Nicolaescu | 2007-09-03 16:48:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-09-03 16:48:04 +0000 |
| commit | b7185a731cf3b899cd001e35e886467cb1ee8318 (patch) | |
| tree | 72f5a81fd9cd34550c835a4da56c9dff6df3e485 | |
| parent | 2fe32d09ebec4fabaacd995fcae46d82b9188625 (diff) | |
| download | emacs-b7185a731cf3b899cd001e35e886467cb1ee8318.tar.gz emacs-b7185a731cf3b899cd001e35e886467cb1ee8318.zip | |
* loadup.el: Fix merge problem, only load "button" once.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/loadup.el | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0fffb1878ab..583e63407e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-09-03 Emanuele Giaquinta <e.giaquinta@glauco.it> (tiny change) | ||
| 2 | |||
| 3 | * loadup.el: Fix merge problem, only load "button" once. | ||
| 4 | |||
| 1 | 2007-09-03 Glenn Morris <rgm@gnu.org> | 5 | 2007-09-03 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * vc-svn.el (vc-svn-print-log): If there is only one file, use | 7 | * vc-svn.el (vc-svn-print-log): If there is only one file, use |
diff --git a/lisp/loadup.el b/lisp/loadup.el index f9ba4a8164f..1b96afd5486 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | (message "%s" (garbage-collect)) | 82 | (message "%s" (garbage-collect)) |
| 83 | (load "simple") | 83 | (load "simple") |
| 84 | 84 | ||
| 85 | (load "button") | ||
| 86 | (load "help") | 85 | (load "help") |
| 87 | 86 | ||
| 88 | (load "jka-cmpr-hook") | 87 | (load "jka-cmpr-hook") |