changeset 87587:546180f9602b

Fix log typo, merge entries.
author Glenn Morris <rgm@gnu.org>
date Sat, 05 Jan 2008 04:14:40 +0000
parents 9554989ee375
children 32e91443c003
files lisp/ChangeLog
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jan 04 21:52:51 2008 +0000
+++ b/lisp/ChangeLog	Sat Jan 05 04:14:40 2008 +0000
@@ -9,12 +9,6 @@
 	(dbus-event-interface-name, dbus-event-member-name): Adapt
 	implementation to serial number.
 
-2008-01-04  Tassilo Horn  <tassilo@member.fsf.org>
-
-	* doc-view.el (doc-view-scroll-up-or-next-page)
-	(doc-view-scroll-down-or-previous-page): Don't scroll to the
-	top/bottom again when on the first/last page.
-
 2008-01-04  Juanma Barranquero  <lekktu@gmail.com>
 
 	* bs.el (bs--get-mode-name): Fix typo in previous change.
@@ -42,6 +36,10 @@
 2008-01-04  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el (doc-view-scroll-up-or-next-page)
+	(doc-view-scroll-down-or-previous-page): Don't scroll to the
+	top/bottom again when on the first/last page.
+
+	* doc-view.el (doc-view-scroll-up-or-next-page)
 	(doc-view-scroll-down-or-previous-page): Use image-scroll-up and
 	image-scroll-down instead of the non-image equivalents.  Don't
 	rely on a signalled condition but switch pages when scrolling
@@ -298,7 +296,7 @@
 	(vc-compatible-state): New function.  Checks whether two states
 	can be in the same changeset; used with 'edited it can test whether
 	the next action for a state should be commit.
-	(vc-default-dired-format0info): Display 'added state.
+	(vc-default-dired-state-info): Display 'removed state.
 	(vc-dired-hook): Turn off undo, this is a speed tweak.
 
 	* vc-bzr.el (vc-bzr-dir-state): Recognize 'added.