Fix toolbar for Log Edit mode

* lisp/vc/log-edit.el (log-edit-tool-bar-map): Fix buttons and
help messages.

* etc/images/README (Files): Fix whitespace.

diff --git a/etc/images/README b/etc/images/README
index 71115540344fbaec63f4d8a5b68cbf4a2cf2c232..dafabaf73542c8775c1afac64f0f7fb99a2e9538 100644 (file)
--- a/etc/images/README
+++ b/etc/images/README
@@ -67,7 +67,7 @@ Emacs images and their source in the GNOME icons stock/ directory:
   attach.xpm                document/stock_attach
   bookmark_add.xpm          actions/bookmark_add
   cancel.xpm                slightly modified generic/stock_stop
-  commit.xpm               code/stock_run
+  commit.xpm                code/stock_run
   connect-to-url.xpm        net/stock_connect-to-url
   connect.xpm               net/stock_connect
   contact.xpm               net/stock_contact
@@ -76,9 +76,9 @@ Emacs images and their source in the GNOME icons stock/ directory:
   describe.xpm              generic/stock_properties
   disconnect.xpm            net/stock_disconnect
   exit.xpm                  generic/stock_exit
-  gen-changelog.xpm        text/stock_autoformat
-  ins-changelog.xpm        form/stock_show-form-dialog
-  load-changelog.xpm       text/stock_insert_endnote
+  gen-changelog.xpm         text/stock_autoformat
+  ins-changelog.xpm         form/stock_show-form-dialog
+  load-changelog.xpm        text/stock_insert_endnote
   lock-broken.xpm           data/stock_lock-broken
   lock-ok.xpm               data/stock_lock-ok
   lock.xpm                  data/stock_lock
@@ -93,7 +93,7 @@ Emacs images and their source in the GNOME icons stock/ directory:
   sort-criteria.xpm         data/stock_sort-criteria
   sort-descending.xpm       slightly modified data/stock_sort-descending
   sort-row-ascending.xpm    data/stock_sort-row-ascending
-  view-diff.xpm                    text/stock_list_enum-restart
+  view-diff.xpm             text/stock_list_enum-restart
   zoom-in.xpm               navigation/stock_zoom-in
   zoom-out.xpm              navigation/stock_zoom-out
 

diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index c2665c802f6ec78ceaf1fb9e73fdebaa8bc8a01a..2b63419cc53c8b88b7bc0ea0cf50af9b00d58f11 100644 (file)
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -109,39 +109,34 @@
     (tool-bar-local-item-from-menu 'log-edit-done "commit"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "Complete the actual action")
+                                   "Exit log buffer and commit the changes")
     (define-key-after map [separator-2] menu-bar-separator)
-    (tool-bar-local-item-from-menu 'log-edit-insert-changelog
-                                   "ins-changelog"
-                                   map log-edit-mode-map :vert-only t
-                                   :help
-                                   "Complete the actual action")
     (tool-bar-local-item-from-menu 'log-edit-insert-changelog
                                    "load-changelog"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "Insert log message from ChangeLog file")
+                                   "Produce log message from ChangeLog file")
     (tool-bar-local-item-from-menu 'log-edit-generate-changelog-from-diff
                                    "gen-changelog"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "Generate a log message from diff")
+                                   "Generate log message skeleton from diffs")
     (tool-bar-local-item-from-menu 'log-edit-add-to-changelog
                                    "ins-changelog"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "Insert this log message into the ChangeLog")
+                                   "Insert this log message into ChangeLog file")
     (define-key-after map [separator-3] menu-bar-separator)
     (tool-bar-local-item-from-menu 'log-edit-show-diff
                                    "view-diff"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "View the diff for the files to be committed")
+                                   "View diffs for the files to be committed")
     (tool-bar-local-item-from-menu 'log-edit-show-files
                                    "info"
                                    map log-edit-mode-map :vert-only t
                                    :help
-                                   "View the list of files to be committed")
+                                   "View list of files to be committed")
     (define-key-after map [separator-4] menu-bar-separator)
     (tool-bar-local-item-from-menu 'undo "undo" map nil)
     (define-key-after map [separator-5] menu-bar-separator)