aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2006-05-25 13:43:36 +0000
committerNick Roberts2006-05-25 13:43:36 +0000
commitb76b35352091d7c97dc8e7dfb42531556af62597 (patch)
treeee8717c8054e85920e0f9b17ef03c6372d7b5512
parentf5b5e4fee1947fe025ef60580677705fe3e66705 (diff)
downloademacs-b76b35352091d7c97dc8e7dfb42531556af62597.tar.gz
emacs-b76b35352091d7c97dc8e7dfb42531556af62597.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog34
1 files changed, 11 insertions, 23 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d23424b0536..7d944be0713 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,11 @@
12006-05-25 Mathias Dahl <mathias.dahl@gmail.com> 12006-05-25 Mathias Dahl <mathias.dahl@gmail.com>
2 2
3 * tumme.el (tumme-display-image): Changed documentation string 3 * tumme.el (tumme-display-image): Change documentation string
4 slightly. 4 slightly.
5 (tumme-dired-display-image): Added call to `display-buffer'. 5 (tumme-dired-display-image): Add call to `display-buffer'.
6 6
7 * dired.el (dired-mode-map): `tumme-display-dired-image' was 7 * dired.el (dired-mode-map): Bind `tumme-dired-display-image'
8 renamed in tumme.el, but there was still a key binding to it 8 to C-t i.
9 here. Changed the binding to the new name.
10 9
112006-05-25 Thien-Thi Nguyen <ttn@gnu.org> 102006-05-25 Thien-Thi Nguyen <ttn@gnu.org>
12 11
@@ -25,7 +24,7 @@
25 24
262006-05-25 Mathias Dahl <mathias.dahl@gmail.com> 252006-05-25 Mathias Dahl <mathias.dahl@gmail.com>
27 26
28 * dired.el (dired-mode-map): Changed menu items for tumme as per 27 * dired.el (dired-mode-map): Change menu items for tumme as per
29 suggestions in emacs-devel. 28 suggestions in emacs-devel.
30 29
312006-05-25 Nick Roberts <nickrob@snap.net.nz> 302006-05-25 Nick Roberts <nickrob@snap.net.nz>
@@ -34,26 +33,15 @@
34 33
352006-05-25 Mathias Dahl <mathias.dahl@gmail.com> 342006-05-25 Mathias Dahl <mathias.dahl@gmail.com>
36 35
37 * tumme.el (tumme-display-dired-image): Renamed to 36 * tumme.el (tumme-display-dired-image): Rename to...
38 `tumme-dired-display-image'. 37 (tumme-dired-display-image): ...this.
39 (tumme-track-movement): Changed default value to t. 38 (tumme-track-movement): Change default value to t.
40 (tumme-display-thumbs): Added new optional parameter DO-NOT-POP, 39 (tumme-display-thumbs): Add new optional parameter DO-NOT-POP,
41 used from `tumme-next-line-and-display' and similar commands. 40 used from `tumme-next-line-and-display' and similar commands.
42<<<<<<< ChangeLog
43 (tumme-dired-display-properties): 41 (tumme-dired-display-properties):
44 42
45======= 43 * dired.el (dired-mode-map): Add Thumbnail submenu under the
46 44 Immediate menu. Add some tumme commands there.
47>>>>>>> 1.9600
48 * dired.el (dired-mode-map): Added Thumbnail sub menu under the
49 Immediate menu. Added some tumme commands there.
50<<<<<<< ChangeLog
51=======
52
532006-05-25 Nick Roberts <nickrob@snap.net.nz>
54
55 * dired.el (dired-mode-map): Fix breakage.
56>>>>>>> 1.9600
57 45
582006-05-24 Luc Teirlinck <teirllm@auburn.edu> 462006-05-24 Luc Teirlinck <teirllm@auburn.edu>
59 47