aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-09 06:15:13 +0000
committerDan Nicolaescu2008-04-09 06:15:13 +0000
commit799224fe61c0e65c9d0ac2107ec8eed8d898c679 (patch)
tree31675d3d38a0bc027e3b0b5537e36a5d430dba01
parent75407435b1821f065e1c42967f3d3384c3732a28 (diff)
downloademacs-799224fe61c0e65c9d0ac2107ec8eed8d898c679.tar.gz
emacs-799224fe61c0e65c9d0ac2107ec8eed8d898c679.zip
* outline.el (outline-mode-menu-bar-map):
* log-view.el (log-view-mode-menu): * log-edit.el (log-edit-menu): Add :help.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/log-edit.el18
-rw-r--r--lisp/log-view.el24
-rw-r--r--lisp/outline.el40
4 files changed, 54 insertions, 34 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bde99394ec..a52575d67b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12008-04-09 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * outline.el (outline-mode-menu-bar-map):
4 * log-view.el (log-view-mode-menu):
5 * log-edit.el (log-edit-menu): Add :help.
6
12008-04-09 Chong Yidong <cyd@stupidchicken.com> 72008-04-09 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * emacs-lisp/regexp-opt.el (regexp-opt-group): Use 9 * emacs-lisp/regexp-opt.el (regexp-opt-group): Use
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 5447cda9f1c..7e532dcc12f 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -77,18 +77,24 @@
77 ["Done" log-edit-done 77 ["Done" log-edit-done
78 :help "Exit log-edit and proceed with the actual action."] 78 :help "Exit log-edit and proceed with the actual action."]
79 "--" 79 "--"
80 ["Insert ChangeLog" log-edit-insert-changelog] 80 ["Insert ChangeLog" log-edit-insert-changelog
81 ["Add to ChangeLog" log-edit-add-to-changelog] 81 :help "Insert a log message by looking at the ChangeLog"]
82 ["Add to ChangeLog" log-edit-add-to-changelog
83 :help "Insert this log message into the appropriate ChangeLog file"]
82 "--" 84 "--"
83 ["Show diff" log-edit-show-diff 85 ["Show diff" log-edit-show-diff
84 :help "Show the diff for the files to be committed."] 86 :help "Show the diff for the files to be committed."]
85 ["List files" log-edit-show-files 87 ["List files" log-edit-show-files
86 :help "Show the list of relevant files."] 88 :help "Show the list of relevant files."]
87 "--" 89 "--"
88 ["Previous comment" log-edit-previous-comment] 90 ["Previous comment" log-edit-previous-comment
89 ["Next comment" log-edit-next-comment] 91 :help "Cycle backwards through comment history"]
90 ["Search comment forward" log-edit-comment-search-forward] 92 ["Next comment" log-edit-next-comment
91 ["Search comment backward" log-edit-comment-search-backward])) 93 :help "Cycle forwards through comment history."]
94 ["Search comment forward" log-edit-comment-search-forward
95 :help "Search forwards through comment history for a substring match of str"]
96 ["Search comment backward" log-edit-comment-search-backward
97 :help "Search backwards through comment history for substring match of str"]))
92 98
93(defcustom log-edit-confirm 'changed 99(defcustom log-edit-confirm 'changed
94 "*If non-nil, `log-edit-done' will request confirmation. 100 "*If non-nil, `log-edit-done' will request confirmation.
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 2f048cc271a..a92d826a5d8 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -152,17 +152,25 @@
152 ;; XXX Do we need menu entries for these? 152 ;; XXX Do we need menu entries for these?
153 ;; ["Quit" quit-window] 153 ;; ["Quit" quit-window]
154 ;; ["Kill This Buffer" kill-this-buffer] 154 ;; ["Kill This Buffer" kill-this-buffer]
155 ["Mark Log Entry for Diff" set-mark-command] 155 ["Mark Log Entry for Diff" set-mark-command
156 ["Diff Revisions" log-view-diff] 156 :help ""]
157 ["Visit Version" log-view-find-revision] 157 ["Diff Revisions" log-view-diff
158 ["Annotate Version" log-view-annotate-version] 158 :help "Get the diff between two revisions"]
159 ["Visit Version" log-view-find-revision
160 :help "Visit the version at point"]
161 ["Annotate Version" log-view-annotate-version
162 :help "Annotate the version at point"]
159 ["Modify Log Comment" log-view-modify-change-comment 163 ["Modify Log Comment" log-view-modify-change-comment
160 :help "Edit the change comment displayed at point"] 164 :help "Edit the change comment displayed at point"]
161 "-----" 165 "-----"
162 ["Next Log Entry" log-view-msg-next] 166 ["Next Log Entry" log-view-msg-next
163 ["Previous Log Entry" log-view-msg-prev] 167 :help "Go to the next count'th log message"]
164 ["Next File" log-view-file-next] 168 ["Previous Log Entry" log-view-msg-prev
165 ["Previous File" log-view-file-prev])) 169 :help "Go to the previous count'th log message"]
170 ["Next File" log-view-file-next
171 :help "Go to the next count'th file"]
172 ["Previous File" log-view-file-prev
173 :help "Go to the previous count'th file"]))
166 174
167(defvar log-view-mode-hook nil 175(defvar log-view-mode-hook nil
168 "Hook run at the end of `log-view-mode'.") 176 "Hook run at the end of `log-view-mode'.")
diff --git a/lisp/outline.el b/lisp/outline.el
index 2aecfe2d11d..837e66fb173 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -105,78 +105,78 @@ in the file it applies to."
105 :help "Hide everything but the top LEVELS levels of headers, in whole buffer")) 105 :help "Hide everything but the top LEVELS levels of headers, in whole buffer"))
106 (define-key map [hide hide-subtree] 106 (define-key map [hide hide-subtree]
107 '(menu-item "Hide Subtree" hide-subtree 107 '(menu-item "Hide Subtree" hide-subtree
108 :help "")) 108 :help "Hide everything after this heading at deeper levels"))
109 (define-key map [hide hide-entry] 109 (define-key map [hide hide-entry]
110 '(menu-item "Hide Entry" hide-entry 110 '(menu-item "Hide Entry" hide-entry
111 :help "")) 111 :help "Hide the body directly following this heading"))
112 (define-key map [hide hide-body] 112 (define-key map [hide hide-body]
113 '(menu-item "Hide Body" hide-body 113 '(menu-item "Hide Body" hide-body
114 :help "")) 114 :help "Hide all body lines in buffer, leaving all headings visible"))
115 (define-key map [hide hide-leaves] 115 (define-key map [hide hide-leaves]
116 '(menu-item "Hide Leaves" hide-leaves 116 '(menu-item "Hide Leaves" hide-leaves
117 :help "")) 117 :help "Hide the body after this heading and at deeper levels"))
118 118
119 (define-key map [show] (cons "Show" (make-sparse-keymap "Show"))) 119 (define-key map [show] (cons "Show" (make-sparse-keymap "Show")))
120 120
121 (define-key map [show show-subtree] 121 (define-key map [show show-subtree]
122 '(menu-item "Show Subtree" show-subtree 122 '(menu-item "Show Subtree" show-subtree
123 :help "")) 123 :help "Show everything after this heading at deeper levels"))
124 (define-key map [show show-children] 124 (define-key map [show show-children]
125 '(menu-item "Show Children" show-children 125 '(menu-item "Show Children" show-children
126 :help "")) 126 :help "Show all direct subheadings of this heading"))
127 (define-key map [show show-branches] 127 (define-key map [show show-branches]
128 '(menu-item "Show Branches" show-branches 128 '(menu-item "Show Branches" show-branches
129 :help "")) 129 :help "Show all subheadings of this heading, but not their bodies"))
130 (define-key map [show show-entry] 130 (define-key map [show show-entry]
131 '(menu-item "Show Entry" show-entry 131 '(menu-item "Show Entry" show-entry
132 :help "")) 132 :help "Show the body directly following this heading"))
133 (define-key map [show show-all] 133 (define-key map [show show-all]
134 '(menu-item "Show All" show-all 134 '(menu-item "Show All" show-all
135 :help "")) 135 :help "Show all of the text in the buffer"))
136 136
137 (define-key map [headings] 137 (define-key map [headings]
138 (cons "Headings" (make-sparse-keymap "Headings"))) 138 (cons "Headings" (make-sparse-keymap "Headings")))
139 139
140 (define-key map [headings demote-subtree] 140 (define-key map [headings demote-subtree]
141 '(menu-item "Demote subtree" outline-demote 141 '(menu-item "Demote subtree" outline-demote
142 :help "")) 142 :help "Demote headings lower down the tree"))
143 (define-key map [headings promote-subtree] 143 (define-key map [headings promote-subtree]
144 '(menu-item "Promote subtree" outline-promote 144 '(menu-item "Promote subtree" outline-promote
145 :help "")) 145 :help "Promote headings higher up the tree"))
146 (define-key map [headings move-subtree-down] 146 (define-key map [headings move-subtree-down]
147 '(menu-item "Move subtree down" outline-move-subtree-down 147 '(menu-item "Move subtree down" outline-move-subtree-down
148 :help "")) 148 :help "Move the currrent subtree down past arg headlines of the same level"))
149 (define-key map [headings move-subtree-up] 149 (define-key map [headings move-subtree-up]
150 '(menu-item "Move subtree up" outline-move-subtree-up 150 '(menu-item "Move subtree up" outline-move-subtree-up
151 :help "")) 151 :help "Move the currrent subtree up past arg headlines of the same level"))
152 (define-key map [headings copy] 152 (define-key map [headings copy]
153 '(menu-item "Copy to kill ring" outline-headers-as-kill 153 '(menu-item "Copy to kill ring" outline-headers-as-kill
154 :enable mark-active 154 :enable mark-active
155 :help "")) 155 :help "Save the visible outline headers in region at the start of the kill ring"))
156 (define-key map [headings outline-insert-heading] 156 (define-key map [headings outline-insert-heading]
157 157
158 '(menu-item "New heading" outline-insert-heading 158 '(menu-item "New heading" outline-insert-heading
159 :help "")) 159 :help "Insert a new heading at same depth at point"))
160 (define-key map [headings outline-backward-same-level] 160 (define-key map [headings outline-backward-same-level]
161 161
162 '(menu-item "Previous Same Level" outline-backward-same-level 162 '(menu-item "Previous Same Level" outline-backward-same-level
163 :help "")) 163 :help "Move backward to the arg'th subheading at same level as this one."))
164 (define-key map [headings outline-forward-same-level] 164 (define-key map [headings outline-forward-same-level]
165 165
166 '(menu-item "Next Same Level" outline-forward-same-level 166 '(menu-item "Next Same Level" outline-forward-same-level
167 :help "")) 167 :help "Move forward to the arg'th subheading at same level as this one"))
168 (define-key map [headings outline-previous-visible-heading] 168 (define-key map [headings outline-previous-visible-heading]
169 169
170 '(menu-item "Previous" outline-previous-visible-heading 170 '(menu-item "Previous" outline-previous-visible-heading
171 :help "")) 171 :help "Move to the previous heading line"))
172 (define-key map [headings outline-next-visible-heading] 172 (define-key map [headings outline-next-visible-heading]
173 173
174 '(menu-item "Next" outline-next-visible-heading 174 '(menu-item "Next" outline-next-visible-heading
175 :help "")) 175 :help "Move to the next visible heading line"))
176 (define-key map [headings outline-up-heading] 176 (define-key map [headings outline-up-heading]
177 177
178 '(menu-item "Up" outline-up-heading 178 '(menu-item "Up" outline-up-heading
179 :help "")) 179 :help "Move to the visible heading line of which the present line is a subheading"))
180 map)) 180 map))
181 181
182(defvar outline-minor-mode-menu-bar-map 182(defvar outline-minor-mode-menu-bar-map