Mercurial > emacs

changeset 83869:56c1fcec9e61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* loadup.el: Fix merge problem, only load "button" once.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 03 Sep 2007 16:48:04 +0000
parents ed170f2c728f
children e80e5fa22d19
files lisp/ChangeLog lisp/loadup.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Sep 03 06:26:43 2007 +0000
+++ b/lisp/ChangeLog	Mon Sep 03 16:48:04 2007 +0000
@@ -1,3 +1,7 @@
+2007-09-03  Emanuele Giaquinta <e.giaquinta@glauco.it>  (tiny change)
+
+	* loadup.el: Fix merge problem, only load "button" once.
+
 2007-09-03  Glenn Morris  <rgm@gnu.org>
 
 	* vc-svn.el (vc-svn-print-log): If there is only one file, use
--- a/lisp/loadup.el	Mon Sep 03 06:26:43 2007 +0000
+++ b/lisp/loadup.el	Mon Sep 03 16:48:04 2007 +0000
@@ -82,7 +82,6 @@
 (message "%s" (garbage-collect))
 (load "simple")
 
-(load "button")
 (load "help")
 
 (load "jka-cmpr-hook")