diff options
| author | Juri Linkov | 2011-09-18 23:43:20 +0300 |
|---|---|---|
| committer | Juri Linkov | 2011-09-18 23:43:20 +0300 |
| commit | 7cc6e15441db1148432514ca3c58283147484ae5 (patch) | |
| tree | 2a483e0135d1573db235edd3e096e8568c5b413e | |
| parent | 80302a817e470464590b79cda28aefaa36edadf6 (diff) | |
| download | emacs-7cc6e15441db1148432514ca3c58283147484ae5.tar.gz emacs-7cc6e15441db1148432514ca3c58283147484ae5.zip | |
Capitalize non-function content words in menu item strings.
* lisp/buff-menu.el (Buffer-menu-mode-map):
* lisp/dired.el (dired-mode-map):
* lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map)
(lisp-interaction-mode-map):
* lisp/emacs-lisp/package.el (package-menu-mode-map):
* lisp/epa.el (epa-key-list-mode-map):
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu)
(menu-bar-options-menu):
* lisp/outline.el (outline-mode-menu-bar-map):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map):
* lisp/vc/vc-dir.el (vc-dir-menu-map):
* lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map):
Capitalize non-function content words in menu item strings.
* lisp/dired.el (dired-mode-map): Add menu item for
`image-dired-dired-toggle-marked-thumbs'.
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/buff-menu.el | 24 | ||||
| -rw-r--r-- | lisp/dired.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 16 | ||||
| -rw-r--r-- | lisp/epa.el | 2 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 12 | ||||
| -rw-r--r-- | lisp/outline.el | 13 | ||||
| -rw-r--r-- | lisp/vc/vc-bzr.el | 10 | ||||
| -rw-r--r-- | lisp/vc/vc-dir.el | 16 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 10 |
11 files changed, 78 insertions, 56 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e32fe1505b6..b20f3e157c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,24 @@ | |||
| 1 | 2011-09-18 Juri Linkov <juri@jurta.org> | 1 | 2011-09-18 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * buff-menu.el (Buffer-menu-mode-map): | ||
| 4 | * dired.el (dired-mode-map): | ||
| 5 | * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map) | ||
| 6 | (lisp-interaction-mode-map): | ||
| 7 | * emacs-lisp/package.el (package-menu-mode-map): | ||
| 8 | * epa.el (epa-key-list-mode-map): | ||
| 9 | * menu-bar.el (menu-bar-showhide-tool-bar-menu) | ||
| 10 | (menu-bar-options-menu): | ||
| 11 | * outline.el (outline-mode-menu-bar-map): | ||
| 12 | * vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map): | ||
| 13 | * vc/vc-dir.el (vc-dir-menu-map): | ||
| 14 | * vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map): | ||
| 15 | Capitalize non-function content words in menu item strings. | ||
| 16 | |||
| 17 | * dired.el (dired-mode-map): Add menu item for | ||
| 18 | `image-dired-dired-toggle-marked-thumbs'. | ||
| 19 | |||
| 20 | 2011-09-18 Juri Linkov <juri@jurta.org> | ||
| 21 | |||
| 3 | * isearch.el (isearch-edit-string): Bind `isearch-new-case-fold' | 22 | * isearch.el (isearch-edit-string): Bind `isearch-new-case-fold' |
| 4 | to `isearch-case-fold-search' and restore its original value | 23 | to `isearch-case-fold-search' and restore its original value |
| 5 | after the `isearch-mode' call. | 24 | after the `isearch-mode' call. |
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index d757453c051..291430d4393 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el | |||
| @@ -167,53 +167,53 @@ Auto Revert Mode.") | |||
| 167 | :help ,(purecopy "Refresh the *Buffer List* buffer contents"))) | 167 | :help ,(purecopy "Refresh the *Buffer List* buffer contents"))) |
| 168 | (define-key menu-map [s0] menu-bar-separator) | 168 | (define-key menu-map [s0] menu-bar-separator) |
| 169 | (define-key menu-map [tf] | 169 | (define-key menu-map [tf] |
| 170 | `(menu-item ,(purecopy "Show only file buffers") Buffer-menu-toggle-files-only | 170 | `(menu-item ,(purecopy "Show Only File Buffers") Buffer-menu-toggle-files-only |
| 171 | :button (:toggle . Buffer-menu-files-only) | 171 | :button (:toggle . Buffer-menu-files-only) |
| 172 | :help ,(purecopy "Toggle whether the current buffer-menu displays only file buffers"))) | 172 | :help ,(purecopy "Toggle whether the current buffer-menu displays only file buffers"))) |
| 173 | (define-key menu-map [s1] menu-bar-separator) | 173 | (define-key menu-map [s1] menu-bar-separator) |
| 174 | ;; FIXME: The "Select" entries could use better names... | 174 | ;; FIXME: The "Select" entries could use better names... |
| 175 | (define-key menu-map [sel] | 175 | (define-key menu-map [sel] |
| 176 | `(menu-item ,(purecopy "Select marked") Buffer-menu-select | 176 | `(menu-item ,(purecopy "Select Marked") Buffer-menu-select |
| 177 | :help ,(purecopy "Select this line's buffer; also display buffers marked with `>'"))) | 177 | :help ,(purecopy "Select this line's buffer; also display buffers marked with `>'"))) |
| 178 | (define-key menu-map [bm2] | 178 | (define-key menu-map [bm2] |
| 179 | `(menu-item ,(purecopy "Select two") Buffer-menu-2-window | 179 | `(menu-item ,(purecopy "Select Two") Buffer-menu-2-window |
| 180 | :help ,(purecopy "Select this line's buffer, with previous buffer in second window"))) | 180 | :help ,(purecopy "Select this line's buffer, with previous buffer in second window"))) |
| 181 | (define-key menu-map [bm1] | 181 | (define-key menu-map [bm1] |
| 182 | `(menu-item ,(purecopy "Select current") Buffer-menu-1-window | 182 | `(menu-item ,(purecopy "Select Current") Buffer-menu-1-window |
| 183 | :help ,(purecopy "Select this line's buffer, alone, in full frame"))) | 183 | :help ,(purecopy "Select this line's buffer, alone, in full frame"))) |
| 184 | (define-key menu-map [ow] | 184 | (define-key menu-map [ow] |
| 185 | `(menu-item ,(purecopy "Select in other window") Buffer-menu-other-window | 185 | `(menu-item ,(purecopy "Select in Other Window") Buffer-menu-other-window |
| 186 | :help ,(purecopy "Select this line's buffer in other window, leaving buffer menu visible"))) | 186 | :help ,(purecopy "Select this line's buffer in other window, leaving buffer menu visible"))) |
| 187 | (define-key menu-map [tw] | 187 | (define-key menu-map [tw] |
| 188 | `(menu-item ,(purecopy "Select in current window") Buffer-menu-this-window | 188 | `(menu-item ,(purecopy "Select in Current Window") Buffer-menu-this-window |
| 189 | :help ,(purecopy "Select this line's buffer in this window"))) | 189 | :help ,(purecopy "Select this line's buffer in this window"))) |
| 190 | (define-key menu-map [s2] menu-bar-separator) | 190 | (define-key menu-map [s2] menu-bar-separator) |
| 191 | (define-key menu-map [is] | 191 | (define-key menu-map [is] |
| 192 | `(menu-item ,(purecopy "Regexp Isearch marked buffers") Buffer-menu-isearch-buffers-regexp | 192 | `(menu-item ,(purecopy "Regexp Isearch Marked Buffers...") Buffer-menu-isearch-buffers-regexp |
| 193 | :help ,(purecopy "Search for a regexp through all marked buffers using Isearch"))) | 193 | :help ,(purecopy "Search for a regexp through all marked buffers using Isearch"))) |
| 194 | (define-key menu-map [ir] | 194 | (define-key menu-map [ir] |
| 195 | `(menu-item ,(purecopy "Isearch marked buffers") Buffer-menu-isearch-buffers | 195 | `(menu-item ,(purecopy "Isearch Marked Buffers...") Buffer-menu-isearch-buffers |
| 196 | :help ,(purecopy "Search for a string through all marked buffers using Isearch"))) | 196 | :help ,(purecopy "Search for a string through all marked buffers using Isearch"))) |
| 197 | (define-key menu-map [s3] menu-bar-separator) | 197 | (define-key menu-map [s3] menu-bar-separator) |
| 198 | (define-key menu-map [by] | 198 | (define-key menu-map [by] |
| 199 | `(menu-item ,(purecopy "Bury") Buffer-menu-bury | 199 | `(menu-item ,(purecopy "Bury") Buffer-menu-bury |
| 200 | :help ,(purecopy "Bury the buffer listed on this line"))) | 200 | :help ,(purecopy "Bury the buffer listed on this line"))) |
| 201 | (define-key menu-map [vt] | 201 | (define-key menu-map [vt] |
| 202 | `(menu-item ,(purecopy "Set unmodified") Buffer-menu-not-modified | 202 | `(menu-item ,(purecopy "Set Unmodified") Buffer-menu-not-modified |
| 203 | :help ,(purecopy "Mark buffer on this line as unmodified (no changes to save)"))) | 203 | :help ,(purecopy "Mark buffer on this line as unmodified (no changes to save)"))) |
| 204 | (define-key menu-map [ex] | 204 | (define-key menu-map [ex] |
| 205 | `(menu-item ,(purecopy "Execute") Buffer-menu-execute | 205 | `(menu-item ,(purecopy "Execute") Buffer-menu-execute |
| 206 | :help ,(purecopy "Save and/or delete buffers marked with s or k commands"))) | 206 | :help ,(purecopy "Save and/or delete buffers marked with s or k commands"))) |
| 207 | (define-key menu-map [s4] menu-bar-separator) | 207 | (define-key menu-map [s4] menu-bar-separator) |
| 208 | (define-key menu-map [delb] | 208 | (define-key menu-map [delb] |
| 209 | `(menu-item ,(purecopy "Mark for delete and move backwards") Buffer-menu-delete-backwards | 209 | `(menu-item ,(purecopy "Mark for Delete and Move Backwards") Buffer-menu-delete-backwards |
| 210 | :help ,(purecopy "Mark buffer on this line to be deleted by x command and move up one line"))) | 210 | :help ,(purecopy "Mark buffer on this line to be deleted by x command and move up one line"))) |
| 211 | (define-key menu-map [del] | 211 | (define-key menu-map [del] |
| 212 | `(menu-item ,(purecopy "Mark for delete") Buffer-menu-delete | 212 | `(menu-item ,(purecopy "Mark for Delete") Buffer-menu-delete |
| 213 | :help ,(purecopy "Mark buffer on this line to be deleted by x command"))) | 213 | :help ,(purecopy "Mark buffer on this line to be deleted by x command"))) |
| 214 | 214 | ||
| 215 | (define-key menu-map [sv] | 215 | (define-key menu-map [sv] |
| 216 | `(menu-item ,(purecopy "Mark for save") Buffer-menu-save | 216 | `(menu-item ,(purecopy "Mark for Save") Buffer-menu-save |
| 217 | :help ,(purecopy "Mark buffer on this line to be saved by x command"))) | 217 | :help ,(purecopy "Mark buffer on this line to be saved by x command"))) |
| 218 | (define-key menu-map [umk] | 218 | (define-key menu-map [umk] |
| 219 | `(menu-item ,(purecopy "Unmark") Buffer-menu-unmark | 219 | `(menu-item ,(purecopy "Unmark") Buffer-menu-unmark |
diff --git a/lisp/dired.el b/lisp/dired.el index f01e195f9ec..60ba14ade84 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -1552,6 +1552,10 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." | |||
| 1552 | [menu-bar immediate image-dired-dired-display-image] | 1552 | [menu-bar immediate image-dired-dired-display-image] |
| 1553 | '(menu-item "Display Image" image-dired-dired-display-image | 1553 | '(menu-item "Display Image" image-dired-dired-display-image |
| 1554 | :help "Display sized image in a separate window")) | 1554 | :help "Display sized image in a separate window")) |
| 1555 | (define-key map | ||
| 1556 | [menu-bar immediate image-dired-dired-toggle-marked-thumbs] | ||
| 1557 | '(menu-item "Toggle Image Thumbnails in This Buffer" image-dired-dired-toggle-marked-thumbs | ||
| 1558 | :help "Add or remove image thumbnails in front of marked file names")) | ||
| 1555 | 1559 | ||
| 1556 | (define-key map [menu-bar immediate revert-buffer] | 1560 | (define-key map [menu-bar immediate revert-buffer] |
| 1557 | '(menu-item "Refresh" revert-buffer | 1561 | '(menu-item "Refresh" revert-buffer |
| @@ -1708,7 +1712,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." | |||
| 1708 | :help "Add image comment to current or marked files")) | 1712 | :help "Add image comment to current or marked files")) |
| 1709 | (define-key map | 1713 | (define-key map |
| 1710 | [menu-bar operate image-dired-display-thumbs] | 1714 | [menu-bar operate image-dired-display-thumbs] |
| 1711 | '(menu-item "Display image thumbnails" image-dired-display-thumbs | 1715 | '(menu-item "Display Image Thumbnails" image-dired-display-thumbs |
| 1712 | :help "Display image thumbnails for current or marked image files")) | 1716 | :help "Display image thumbnails for current or marked image files")) |
| 1713 | 1717 | ||
| 1714 | (define-key map [menu-bar operate dashes-4] | 1718 | (define-key map [menu-bar operate dashes-4] |
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f2bea30ea39..9408c0a3c9d 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -297,7 +297,7 @@ font-lock keywords will not be case sensitive." | |||
| 297 | `(menu-item ,(purecopy "Untrace All") untrace-all | 297 | `(menu-item ,(purecopy "Untrace All") untrace-all |
| 298 | :help ,(purecopy "Untrace all currently traced functions"))) | 298 | :help ,(purecopy "Untrace all currently traced functions"))) |
| 299 | (define-key tracing-map [tr-uf] | 299 | (define-key tracing-map [tr-uf] |
| 300 | `(menu-item ,(purecopy "Untrace function...") untrace-function | 300 | `(menu-item ,(purecopy "Untrace Function...") untrace-function |
| 301 | :help ,(purecopy "Untrace function, and possibly activate all remaining advice"))) | 301 | :help ,(purecopy "Untrace function, and possibly activate all remaining advice"))) |
| 302 | (define-key tracing-map [tr-sep] menu-bar-separator) | 302 | (define-key tracing-map [tr-sep] menu-bar-separator) |
| 303 | (define-key tracing-map [tr-q] | 303 | (define-key tracing-map [tr-q] |
| @@ -358,7 +358,7 @@ font-lock keywords will not be case sensitive." | |||
| 358 | `(menu-item ,(purecopy "Byte-compile and Load") emacs-lisp-byte-compile-and-load | 358 | `(menu-item ,(purecopy "Byte-compile and Load") emacs-lisp-byte-compile-and-load |
| 359 | :help ,(purecopy "Byte-compile the current file (if it has changed), then load compiled code"))) | 359 | :help ,(purecopy "Byte-compile the current file (if it has changed), then load compiled code"))) |
| 360 | (define-key menu-map [byte-compile] | 360 | (define-key menu-map [byte-compile] |
| 361 | `(menu-item ,(purecopy "Byte-compile this File") emacs-lisp-byte-compile | 361 | `(menu-item ,(purecopy "Byte-compile This File") emacs-lisp-byte-compile |
| 362 | :help ,(purecopy "Byte compile the file containing the current buffer"))) | 362 | :help ,(purecopy "Byte compile the file containing the current buffer"))) |
| 363 | (define-key menu-map [separator-eval] menu-bar-separator) | 363 | (define-key menu-map [separator-eval] menu-bar-separator) |
| 364 | (define-key menu-map [ielm] | 364 | (define-key menu-map [ielm] |
| @@ -509,7 +509,7 @@ if that value is non-nil." | |||
| 509 | `(menu-item ,(purecopy "Evaluate Defun") eval-defun | 509 | `(menu-item ,(purecopy "Evaluate Defun") eval-defun |
| 510 | :help ,(purecopy "Evaluate the top-level form containing point, or after point"))) | 510 | :help ,(purecopy "Evaluate the top-level form containing point, or after point"))) |
| 511 | (define-key menu-map [eval-print-last-sexp] | 511 | (define-key menu-map [eval-print-last-sexp] |
| 512 | `(menu-item ,(purecopy "Evaluate and print") eval-print-last-sexp | 512 | `(menu-item ,(purecopy "Evaluate and Print") eval-print-last-sexp |
| 513 | :help ,(purecopy "Evaluate sexp before point; print value into current buffer"))) | 513 | :help ,(purecopy "Evaluate sexp before point; print value into current buffer"))) |
| 514 | (define-key menu-map [edebug-defun-lisp-interaction] | 514 | (define-key menu-map [edebug-defun-lisp-interaction] |
| 515 | `(menu-item ,(purecopy "Instrument Function for Debugging") edebug-defun | 515 | `(menu-item ,(purecopy "Instrument Function for Debugging") edebug-defun |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index f0b1537e2b3..4cab8f43480 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1297,30 +1297,30 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." | |||
| 1297 | '(menu-item "Unmark" package-menu-mark-unmark | 1297 | '(menu-item "Unmark" package-menu-mark-unmark |
| 1298 | :help "Clear any marks on a package and move to the next line")) | 1298 | :help "Clear any marks on a package and move to the next line")) |
| 1299 | (define-key menu-map [munm] | 1299 | (define-key menu-map [munm] |
| 1300 | '(menu-item "Unmark backwards" package-menu-backup-unmark | 1300 | '(menu-item "Unmark Backwards" package-menu-backup-unmark |
| 1301 | :help "Back up one line and clear any marks on that package")) | 1301 | :help "Back up one line and clear any marks on that package")) |
| 1302 | (define-key menu-map [md] | 1302 | (define-key menu-map [md] |
| 1303 | '(menu-item "Mark for deletion" package-menu-mark-delete | 1303 | '(menu-item "Mark for Deletion" package-menu-mark-delete |
| 1304 | :help "Mark a package for deletion and move to the next line")) | 1304 | :help "Mark a package for deletion and move to the next line")) |
| 1305 | (define-key menu-map [mi] | 1305 | (define-key menu-map [mi] |
| 1306 | '(menu-item "Mark for install" package-menu-mark-install | 1306 | '(menu-item "Mark for Install" package-menu-mark-install |
| 1307 | :help "Mark a package for installation and move to the next line")) | 1307 | :help "Mark a package for installation and move to the next line")) |
| 1308 | (define-key menu-map [mupgrades] | 1308 | (define-key menu-map [mupgrades] |
| 1309 | '(menu-item "Mark upgradable packages" package-menu-mark-upgrades | 1309 | '(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades |
| 1310 | :help "Mark packages that have a newer version for upgrading")) | 1310 | :help "Mark packages that have a newer version for upgrading")) |
| 1311 | (define-key menu-map [s3] '("--")) | 1311 | (define-key menu-map [s3] '("--")) |
| 1312 | (define-key menu-map [mg] | 1312 | (define-key menu-map [mg] |
| 1313 | '(menu-item "Update package list" revert-buffer | 1313 | '(menu-item "Update Package List" revert-buffer |
| 1314 | :help "Update the list of packages")) | 1314 | :help "Update the list of packages")) |
| 1315 | (define-key menu-map [mr] | 1315 | (define-key menu-map [mr] |
| 1316 | '(menu-item "Refresh package list" package-menu-refresh | 1316 | '(menu-item "Refresh Package List" package-menu-refresh |
| 1317 | :help "Download the ELPA archive")) | 1317 | :help "Download the ELPA archive")) |
| 1318 | (define-key menu-map [s4] '("--")) | 1318 | (define-key menu-map [s4] '("--")) |
| 1319 | (define-key menu-map [mt] | 1319 | (define-key menu-map [mt] |
| 1320 | '(menu-item "Mark obsolete packages" package-menu-mark-obsolete-for-deletion | 1320 | '(menu-item "Mark Obsolete Packages" package-menu-mark-obsolete-for-deletion |
| 1321 | :help "Mark all obsolete packages for deletion")) | 1321 | :help "Mark all obsolete packages for deletion")) |
| 1322 | (define-key menu-map [mx] | 1322 | (define-key menu-map [mx] |
| 1323 | '(menu-item "Execute actions" package-menu-execute | 1323 | '(menu-item "Execute Actions" package-menu-execute |
| 1324 | :help "Perform all the marked actions")) | 1324 | :help "Perform all the marked actions")) |
| 1325 | (define-key menu-map [s5] '("--")) | 1325 | (define-key menu-map [s5] '("--")) |
| 1326 | (define-key menu-map [mh] | 1326 | (define-key menu-map [mh] |
diff --git a/lisp/epa.el b/lisp/epa.el index f0ec1ece0d1..5164181454a 100644 --- a/lisp/epa.el +++ b/lisp/epa.el | |||
| @@ -239,7 +239,7 @@ You should bind this variable with `let', but do not set it globally.") | |||
| 239 | :help "Encrypt FILE for RECIPIENTS")) | 239 | :help "Encrypt FILE for RECIPIENTS")) |
| 240 | (define-key menu-map [separator-epa-key-list] '(menu-item "--")) | 240 | (define-key menu-map [separator-epa-key-list] '(menu-item "--")) |
| 241 | (define-key menu-map [epa-key-list-delete-keys] | 241 | (define-key menu-map [epa-key-list-delete-keys] |
| 242 | '(menu-item "Delete keys" epa-delete-keys | 242 | '(menu-item "Delete Keys" epa-delete-keys |
| 243 | :help "Delete Marked Keys")) | 243 | :help "Delete Marked Keys")) |
| 244 | (define-key menu-map [epa-key-list-import-keys] | 244 | (define-key menu-map [epa-key-list-import-keys] |
| 245 | '(menu-item "Import Keys" epa-import-keys | 245 | '(menu-item "Import Keys" epa-import-keys |
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index caae40ed8c5..eceb3afc147 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -985,7 +985,7 @@ by \"Save Options\" in Custom buffers.") | |||
| 985 | (let ((menu (make-sparse-keymap "Tool-bar"))) | 985 | (let ((menu (make-sparse-keymap "Tool-bar"))) |
| 986 | 986 | ||
| 987 | (define-key menu [showhide-tool-bar-left] | 987 | (define-key menu [showhide-tool-bar-left] |
| 988 | `(menu-item ,(purecopy "On the left") | 988 | `(menu-item ,(purecopy "On the Left") |
| 989 | menu-bar-showhide-tool-bar-menu-customize-enable-left | 989 | menu-bar-showhide-tool-bar-menu-customize-enable-left |
| 990 | :help ,(purecopy "Tool-bar at the left side") | 990 | :help ,(purecopy "Tool-bar at the left side") |
| 991 | :visible (display-graphic-p) | 991 | :visible (display-graphic-p) |
| @@ -997,7 +997,7 @@ by \"Save Options\" in Custom buffers.") | |||
| 997 | 'left))))) | 997 | 'left))))) |
| 998 | 998 | ||
| 999 | (define-key menu [showhide-tool-bar-right] | 999 | (define-key menu [showhide-tool-bar-right] |
| 1000 | `(menu-item ,(purecopy "On the right") | 1000 | `(menu-item ,(purecopy "On the Right") |
| 1001 | menu-bar-showhide-tool-bar-menu-customize-enable-right | 1001 | menu-bar-showhide-tool-bar-menu-customize-enable-right |
| 1002 | :help ,(purecopy "Tool-bar at the right side") | 1002 | :help ,(purecopy "Tool-bar at the right side") |
| 1003 | :visible (display-graphic-p) | 1003 | :visible (display-graphic-p) |
| @@ -1009,7 +1009,7 @@ by \"Save Options\" in Custom buffers.") | |||
| 1009 | 'right))))) | 1009 | 'right))))) |
| 1010 | 1010 | ||
| 1011 | (define-key menu [showhide-tool-bar-bottom] | 1011 | (define-key menu [showhide-tool-bar-bottom] |
| 1012 | `(menu-item ,(purecopy "On the bottom") | 1012 | `(menu-item ,(purecopy "On the Bottom") |
| 1013 | menu-bar-showhide-tool-bar-menu-customize-enable-bottom | 1013 | menu-bar-showhide-tool-bar-menu-customize-enable-bottom |
| 1014 | :help ,(purecopy "Tool-bar at the bottom") | 1014 | :help ,(purecopy "Tool-bar at the bottom") |
| 1015 | :visible (display-graphic-p) | 1015 | :visible (display-graphic-p) |
| @@ -1021,7 +1021,7 @@ by \"Save Options\" in Custom buffers.") | |||
| 1021 | 'bottom))))) | 1021 | 'bottom))))) |
| 1022 | 1022 | ||
| 1023 | (define-key menu [showhide-tool-bar-top] | 1023 | (define-key menu [showhide-tool-bar-top] |
| 1024 | `(menu-item ,(purecopy "On the top") | 1024 | `(menu-item ,(purecopy "On the Top") |
| 1025 | menu-bar-showhide-tool-bar-menu-customize-enable-top | 1025 | menu-bar-showhide-tool-bar-menu-customize-enable-top |
| 1026 | :help ,(purecopy "Tool-bar at the top") | 1026 | :help ,(purecopy "Tool-bar at the top") |
| 1027 | :visible (display-graphic-p) | 1027 | :visible (display-graphic-p) |
| @@ -1200,7 +1200,7 @@ mail status in mode line")) | |||
| 1200 | (define-key menu [menu-system-font] | 1200 | (define-key menu [menu-system-font] |
| 1201 | (menu-bar-make-toggle | 1201 | (menu-bar-make-toggle |
| 1202 | toggle-use-system-font font-use-system-font | 1202 | toggle-use-system-font font-use-system-font |
| 1203 | "Use system font" | 1203 | "Use System Font" |
| 1204 | "Use system font: %s" | 1204 | "Use system font: %s" |
| 1205 | "Use the monospaced font defined by the system"))) | 1205 | "Use the monospaced font defined by the system"))) |
| 1206 | 1206 | ||
| @@ -1304,7 +1304,7 @@ mail status in mode line")) | |||
| 1304 | (eq 'turn-on-auto-fill text-mode-hook))))) | 1304 | (eq 'turn-on-auto-fill text-mode-hook))))) |
| 1305 | 1305 | ||
| 1306 | (define-key menu [line-wrapping] | 1306 | (define-key menu [line-wrapping] |
| 1307 | `(menu-item ,(purecopy "Line Wrapping in this Buffer") | 1307 | `(menu-item ,(purecopy "Line Wrapping in This Buffer") |
| 1308 | ,menu-bar-line-wrapping-menu)) | 1308 | ,menu-bar-line-wrapping-menu)) |
| 1309 | 1309 | ||
| 1310 | 1310 | ||
diff --git a/lisp/outline.el b/lisp/outline.el index 2f84e7d93ea..f864058c6fc 100644 --- a/lisp/outline.el +++ b/lisp/outline.el | |||
| @@ -137,24 +137,23 @@ in the file it applies to." | |||
| 137 | (cons "Headings" (make-sparse-keymap "Headings"))) | 137 | (cons "Headings" (make-sparse-keymap "Headings"))) |
| 138 | 138 | ||
| 139 | (define-key map [headings demote-subtree] | 139 | (define-key map [headings demote-subtree] |
| 140 | '(menu-item "Demote subtree" outline-demote | 140 | '(menu-item "Demote Subtree" outline-demote |
| 141 | :help "Demote headings lower down the tree")) | 141 | :help "Demote headings lower down the tree")) |
| 142 | (define-key map [headings promote-subtree] | 142 | (define-key map [headings promote-subtree] |
| 143 | '(menu-item "Promote subtree" outline-promote | 143 | '(menu-item "Promote Subtree" outline-promote |
| 144 | :help "Promote headings higher up the tree")) | 144 | :help "Promote headings higher up the tree")) |
| 145 | (define-key map [headings move-subtree-down] | 145 | (define-key map [headings move-subtree-down] |
| 146 | '(menu-item "Move subtree down" outline-move-subtree-down | 146 | '(menu-item "Move Subtree Down" outline-move-subtree-down |
| 147 | :help "Move the currrent subtree down past arg headlines of the same level")) | 147 | :help "Move the currrent subtree down past arg headlines of the same level")) |
| 148 | (define-key map [headings move-subtree-up] | 148 | (define-key map [headings move-subtree-up] |
| 149 | '(menu-item "Move subtree up" outline-move-subtree-up | 149 | '(menu-item "Move Subtree Up" outline-move-subtree-up |
| 150 | :help "Move the currrent subtree up past arg headlines of the same level")) | 150 | :help "Move the currrent subtree up past arg headlines of the same level")) |
| 151 | (define-key map [headings copy] | 151 | (define-key map [headings copy] |
| 152 | '(menu-item "Copy to kill ring" outline-headers-as-kill | 152 | '(menu-item "Copy to Kill Ring" outline-headers-as-kill |
| 153 | :enable mark-active | 153 | :enable mark-active |
| 154 | :help "Save the visible outline headers in region at the start of the kill ring")) | 154 | :help "Save the visible outline headers in region at the start of the kill ring")) |
| 155 | (define-key map [headings outline-insert-heading] | 155 | (define-key map [headings outline-insert-heading] |
| 156 | 156 | '(menu-item "New Heading" outline-insert-heading | |
| 157 | '(menu-item "New heading" outline-insert-heading | ||
| 158 | :help "Insert a new heading at same depth at point")) | 157 | :help "Insert a new heading at same depth at point")) |
| 159 | (define-key map [headings outline-backward-same-level] | 158 | (define-key map [headings outline-backward-same-level] |
| 160 | 159 | ||
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 4eff3244cdc..3ab1caf2864 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -964,23 +964,23 @@ stream. Standard error output is discarded." | |||
| 964 | (defvar vc-bzr-shelve-menu-map | 964 | (defvar vc-bzr-shelve-menu-map |
| 965 | (let ((map (make-sparse-keymap "Bzr Shelve"))) | 965 | (let ((map (make-sparse-keymap "Bzr Shelve"))) |
| 966 | (define-key map [de] | 966 | (define-key map [de] |
| 967 | '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point | 967 | '(menu-item "Delete Shelf" vc-bzr-shelve-delete-at-point |
| 968 | :help "Delete the current shelf")) | 968 | :help "Delete the current shelf")) |
| 969 | (define-key map [ap] | 969 | (define-key map [ap] |
| 970 | '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point | 970 | '(menu-item "Apply and Keep Shelf" vc-bzr-shelve-apply-and-keep-at-point |
| 971 | :help "Apply the current shelf and keep it")) | 971 | :help "Apply the current shelf and keep it")) |
| 972 | (define-key map [po] | 972 | (define-key map [po] |
| 973 | '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point | 973 | '(menu-item "Apply and Remove Shelf (Pop)" vc-bzr-shelve-apply-at-point |
| 974 | :help "Apply the current shelf and remove it")) | 974 | :help "Apply the current shelf and remove it")) |
| 975 | (define-key map [sh] | 975 | (define-key map [sh] |
| 976 | '(menu-item "Show shelve" vc-bzr-shelve-show-at-point | 976 | '(menu-item "Show Shelve" vc-bzr-shelve-show-at-point |
| 977 | :help "Show the contents of the current shelve")) | 977 | :help "Show the contents of the current shelve")) |
| 978 | map)) | 978 | map)) |
| 979 | 979 | ||
| 980 | (defvar vc-bzr-extra-menu-map | 980 | (defvar vc-bzr-extra-menu-map |
| 981 | (let ((map (make-sparse-keymap))) | 981 | (let ((map (make-sparse-keymap))) |
| 982 | (define-key map [bzr-sn] | 982 | (define-key map [bzr-sn] |
| 983 | '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot | 983 | '(menu-item "Shelve a Snapshot" vc-bzr-shelve-snapshot |
| 984 | :help "Shelve the current state of the tree and keep the current state")) | 984 | :help "Shelve the current state of the tree and keep the current state")) |
| 985 | (define-key map [bzr-sh] | 985 | (define-key map [bzr-sh] |
| 986 | '(menu-item "Shelve..." vc-bzr-shelve | 986 | '(menu-item "Shelve..." vc-bzr-shelve |
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 5f3a9a21b59..ed16ee9f6f8 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el | |||
| @@ -125,15 +125,15 @@ See `run-hooks'." | |||
| 125 | :enable (not (vc-dir-busy)) | 125 | :enable (not (vc-dir-busy)) |
| 126 | :help "Refresh the contents of the directory buffer")) | 126 | :help "Refresh the contents of the directory buffer")) |
| 127 | (define-key map [remup] | 127 | (define-key map [remup] |
| 128 | '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date | 128 | '(menu-item "Hide Up-to-date" vc-dir-hide-up-to-date |
| 129 | :help "Hide up-to-date items from display")) | 129 | :help "Hide up-to-date items from display")) |
| 130 | ;; Movement. | 130 | ;; Movement. |
| 131 | (define-key map [sepmv] '("--")) | 131 | (define-key map [sepmv] '("--")) |
| 132 | (define-key map [next-line] | 132 | (define-key map [next-line] |
| 133 | '(menu-item "Next line" vc-dir-next-line | 133 | '(menu-item "Next Line" vc-dir-next-line |
| 134 | :help "Go to the next line" :keys "n")) | 134 | :help "Go to the next line" :keys "n")) |
| 135 | (define-key map [previous-line] | 135 | (define-key map [previous-line] |
| 136 | '(menu-item "Previous line" vc-dir-previous-line | 136 | '(menu-item "Previous Line" vc-dir-previous-line |
| 137 | :help "Go to the previous line")) | 137 | :help "Go to the previous line")) |
| 138 | ;; Marking. | 138 | ;; Marking. |
| 139 | (define-key map [sepmrk] '("--")) | 139 | (define-key map [sepmrk] '("--")) |
| @@ -142,7 +142,7 @@ See `run-hooks'." | |||
| 142 | :help "Unmark all files that are in the same state as the current file\ | 142 | :help "Unmark all files that are in the same state as the current file\ |
| 143 | \nWith prefix argument unmark all files")) | 143 | \nWith prefix argument unmark all files")) |
| 144 | (define-key map [unmark-previous] | 144 | (define-key map [unmark-previous] |
| 145 | '(menu-item "Unmark previous " vc-dir-unmark-file-up | 145 | '(menu-item "Unmark Previous " vc-dir-unmark-file-up |
| 146 | :help "Move to the previous line and unmark the file")) | 146 | :help "Move to the previous line and unmark the file")) |
| 147 | 147 | ||
| 148 | (define-key map [mark-all] | 148 | (define-key map [mark-all] |
| @@ -171,10 +171,10 @@ See `run-hooks'." | |||
| 171 | '(menu-item "Isearch Files..." vc-dir-isearch | 171 | '(menu-item "Isearch Files..." vc-dir-isearch |
| 172 | :help "Incremental search a string in the marked files")) | 172 | :help "Incremental search a string in the marked files")) |
| 173 | (define-key map [open-other] | 173 | (define-key map [open-other] |
| 174 | '(menu-item "Open in other window" vc-dir-find-file-other-window | 174 | '(menu-item "Open in Other Window" vc-dir-find-file-other-window |
| 175 | :help "Find the file on the current line, in another window")) | 175 | :help "Find the file on the current line, in another window")) |
| 176 | (define-key map [open] | 176 | (define-key map [open] |
| 177 | '(menu-item "Open file" vc-dir-find-file | 177 | '(menu-item "Open File" vc-dir-find-file |
| 178 | :help "Find the file on the current line")) | 178 | :help "Find the file on the current line")) |
| 179 | (define-key map [sepvcdet] '("--")) | 179 | (define-key map [sepvcdet] '("--")) |
| 180 | ;; FIXME: This needs a key binding. And maybe a better name | 180 | ;; FIXME: This needs a key binding. And maybe a better name |
| @@ -203,10 +203,10 @@ See `run-hooks'." | |||
| 203 | ;; VC commands. | 203 | ;; VC commands. |
| 204 | (define-key map [sepvccmd] '("--")) | 204 | (define-key map [sepvccmd] '("--")) |
| 205 | (define-key map [update] | 205 | (define-key map [update] |
| 206 | '(menu-item "Update to latest version" vc-update | 206 | '(menu-item "Update to Latest Version" vc-update |
| 207 | :help "Update the current fileset's files to their tip revisions")) | 207 | :help "Update the current fileset's files to their tip revisions")) |
| 208 | (define-key map [revert] | 208 | (define-key map [revert] |
| 209 | '(menu-item "Revert to base version" vc-revert | 209 | '(menu-item "Revert to Base Version" vc-revert |
| 210 | :help "Revert working copies of the selected fileset to their repository contents.")) | 210 | :help "Revert working copies of the selected fileset to their repository contents.")) |
| 211 | (define-key map [next-action] | 211 | (define-key map [next-action] |
| 212 | ;; FIXME: This really really really needs a better name! | 212 | ;; FIXME: This really really really needs a better name! |
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 1bb246fea0b..e9cbeeeb40a 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -486,16 +486,16 @@ or an empty string if none." | |||
| 486 | (defvar vc-git-stash-menu-map | 486 | (defvar vc-git-stash-menu-map |
| 487 | (let ((map (make-sparse-keymap "Git Stash"))) | 487 | (let ((map (make-sparse-keymap "Git Stash"))) |
| 488 | (define-key map [de] | 488 | (define-key map [de] |
| 489 | '(menu-item "Delete stash" vc-git-stash-delete-at-point | 489 | '(menu-item "Delete Stash" vc-git-stash-delete-at-point |
| 490 | :help "Delete the current stash")) | 490 | :help "Delete the current stash")) |
| 491 | (define-key map [ap] | 491 | (define-key map [ap] |
| 492 | '(menu-item "Apply stash" vc-git-stash-apply-at-point | 492 | '(menu-item "Apply Stash" vc-git-stash-apply-at-point |
| 493 | :help "Apply the current stash and keep it in the stash list")) | 493 | :help "Apply the current stash and keep it in the stash list")) |
| 494 | (define-key map [po] | 494 | (define-key map [po] |
| 495 | '(menu-item "Apply and remove stash (pop)" vc-git-stash-pop-at-point | 495 | '(menu-item "Apply and Remove Stash (Pop)" vc-git-stash-pop-at-point |
| 496 | :help "Apply the current stash and remove it")) | 496 | :help "Apply the current stash and remove it")) |
| 497 | (define-key map [sh] | 497 | (define-key map [sh] |
| 498 | '(menu-item "Show stash" vc-git-stash-show-at-point | 498 | '(menu-item "Show Stash" vc-git-stash-show-at-point |
| 499 | :help "Show the contents of the current stash")) | 499 | :help "Show the contents of the current stash")) |
| 500 | map)) | 500 | map)) |
| 501 | 501 | ||
| @@ -933,7 +933,7 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 933 | '(menu-item "Git grep..." vc-git-grep | 933 | '(menu-item "Git grep..." vc-git-grep |
| 934 | :help "Run the `git grep' command")) | 934 | :help "Run the `git grep' command")) |
| 935 | (define-key map [git-sn] | 935 | (define-key map [git-sn] |
| 936 | '(menu-item "Stash a snapshot" vc-git-stash-snapshot | 936 | '(menu-item "Stash a Snapshot" vc-git-stash-snapshot |
| 937 | :help "Stash the current state of the tree and keep the current state")) | 937 | :help "Stash the current state of the tree and keep the current state")) |
| 938 | (define-key map [git-st] | 938 | (define-key map [git-st] |
| 939 | '(menu-item "Create Stash..." vc-git-stash | 939 | '(menu-item "Create Stash..." vc-git-stash |