Commit 7cc6e154 authored by Juri Linkov's avatar Juri Linkov
Browse files

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'.
parent 80302a81
2011-09-18 Juri Linkov <juri@jurta.org>
* buff-menu.el (Buffer-menu-mode-map):
* dired.el (dired-mode-map):
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map)
(lisp-interaction-mode-map):
* emacs-lisp/package.el (package-menu-mode-map):
* epa.el (epa-key-list-mode-map):
* menu-bar.el (menu-bar-showhide-tool-bar-menu)
(menu-bar-options-menu):
* outline.el (outline-mode-menu-bar-map):
* vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map):
* vc/vc-dir.el (vc-dir-menu-map):
* vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map):
Capitalize non-function content words in menu item strings.
* dired.el (dired-mode-map): Add menu item for
`image-dired-dired-toggle-marked-thumbs'.
2011-09-18 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-edit-string): Bind `isearch-new-case-fold'
......
......@@ -167,53 +167,53 @@ Auto Revert Mode.")
:help ,(purecopy "Refresh the *Buffer List* buffer contents")))
(define-key menu-map [s0] menu-bar-separator)
(define-key menu-map [tf]
`(menu-item ,(purecopy "Show only file buffers") Buffer-menu-toggle-files-only
`(menu-item ,(purecopy "Show Only File Buffers") Buffer-menu-toggle-files-only
:button (:toggle . Buffer-menu-files-only)
:help ,(purecopy "Toggle whether the current buffer-menu displays only file buffers")))
(define-key menu-map [s1] menu-bar-separator)
;; FIXME: The "Select" entries could use better names...
(define-key menu-map [sel]
`(menu-item ,(purecopy "Select marked") Buffer-menu-select
`(menu-item ,(purecopy "Select Marked") Buffer-menu-select
:help ,(purecopy "Select this line's buffer; also display buffers marked with `>'")))
(define-key menu-map [bm2]
`(menu-item ,(purecopy "Select two") Buffer-menu-2-window
`(menu-item ,(purecopy "Select Two") Buffer-menu-2-window
:help ,(purecopy "Select this line's buffer, with previous buffer in second window")))
(define-key menu-map [bm1]
`(menu-item ,(purecopy "Select current") Buffer-menu-1-window
`(menu-item ,(purecopy "Select Current") Buffer-menu-1-window
:help ,(purecopy "Select this line's buffer, alone, in full frame")))
(define-key menu-map [ow]
`(menu-item ,(purecopy "Select in other window") Buffer-menu-other-window
`(menu-item ,(purecopy "Select in Other Window") Buffer-menu-other-window
:help ,(purecopy "Select this line's buffer in other window, leaving buffer menu visible")))
(define-key menu-map [tw]
`(menu-item ,(purecopy "Select in current window") Buffer-menu-this-window
`(menu-item ,(purecopy "Select in Current Window") Buffer-menu-this-window
:help ,(purecopy "Select this line's buffer in this window")))
(define-key menu-map [s2] menu-bar-separator)
(define-key menu-map [is]
`(menu-item ,(purecopy "Regexp Isearch marked buffers") Buffer-menu-isearch-buffers-regexp
`(menu-item ,(purecopy "Regexp Isearch Marked Buffers...") Buffer-menu-isearch-buffers-regexp
:help ,(purecopy "Search for a regexp through all marked buffers using Isearch")))
(define-key menu-map [ir]
`(menu-item ,(purecopy "Isearch marked buffers") Buffer-menu-isearch-buffers
`(menu-item ,(purecopy "Isearch Marked Buffers...") Buffer-menu-isearch-buffers
:help ,(purecopy "Search for a string through all marked buffers using Isearch")))
(define-key menu-map [s3] menu-bar-separator)
(define-key menu-map [by]
`(menu-item ,(purecopy "Bury") Buffer-menu-bury
:help ,(purecopy "Bury the buffer listed on this line")))
(define-key menu-map [vt]
`(menu-item ,(purecopy "Set unmodified") Buffer-menu-not-modified
`(menu-item ,(purecopy "Set Unmodified") Buffer-menu-not-modified
:help ,(purecopy "Mark buffer on this line as unmodified (no changes to save)")))
(define-key menu-map [ex]
`(menu-item ,(purecopy "Execute") Buffer-menu-execute
:help ,(purecopy "Save and/or delete buffers marked with s or k commands")))
(define-key menu-map [s4] menu-bar-separator)
(define-key menu-map [delb]
`(menu-item ,(purecopy "Mark for delete and move backwards") Buffer-menu-delete-backwards
`(menu-item ,(purecopy "Mark for Delete and Move Backwards") Buffer-menu-delete-backwards
:help ,(purecopy "Mark buffer on this line to be deleted by x command and move up one line")))
(define-key menu-map [del]
`(menu-item ,(purecopy "Mark for delete") Buffer-menu-delete
`(menu-item ,(purecopy "Mark for Delete") Buffer-menu-delete
:help ,(purecopy "Mark buffer on this line to be deleted by x command")))
(define-key menu-map [sv]
`(menu-item ,(purecopy "Mark for save") Buffer-menu-save
`(menu-item ,(purecopy "Mark for Save") Buffer-menu-save
:help ,(purecopy "Mark buffer on this line to be saved by x command")))
(define-key menu-map [umk]
`(menu-item ,(purecopy "Unmark") Buffer-menu-unmark
......
......@@ -1552,6 +1552,10 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
[menu-bar immediate image-dired-dired-display-image]
'(menu-item "Display Image" image-dired-dired-display-image
:help "Display sized image in a separate window"))
(define-key map
[menu-bar immediate image-dired-dired-toggle-marked-thumbs]
'(menu-item "Toggle Image Thumbnails in This Buffer" image-dired-dired-toggle-marked-thumbs
:help "Add or remove image thumbnails in front of marked file names"))
(define-key map [menu-bar immediate revert-buffer]
'(menu-item "Refresh" revert-buffer
......@@ -1708,7 +1712,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
:help "Add image comment to current or marked files"))
(define-key map
[menu-bar operate image-dired-display-thumbs]
'(menu-item "Display image thumbnails" image-dired-display-thumbs
'(menu-item "Display Image Thumbnails" image-dired-display-thumbs
:help "Display image thumbnails for current or marked image files"))
(define-key map [menu-bar operate dashes-4]
......
......@@ -297,7 +297,7 @@ font-lock keywords will not be case sensitive."
`(menu-item ,(purecopy "Untrace All") untrace-all
:help ,(purecopy "Untrace all currently traced functions")))
(define-key tracing-map [tr-uf]
`(menu-item ,(purecopy "Untrace function...") untrace-function
`(menu-item ,(purecopy "Untrace Function...") untrace-function
:help ,(purecopy "Untrace function, and possibly activate all remaining advice")))
(define-key tracing-map [tr-sep] menu-bar-separator)
(define-key tracing-map [tr-q]
......@@ -358,7 +358,7 @@ font-lock keywords will not be case sensitive."
`(menu-item ,(purecopy "Byte-compile and Load") emacs-lisp-byte-compile-and-load
:help ,(purecopy "Byte-compile the current file (if it has changed), then load compiled code")))
(define-key menu-map [byte-compile]
`(menu-item ,(purecopy "Byte-compile this File") emacs-lisp-byte-compile
`(menu-item ,(purecopy "Byte-compile This File") emacs-lisp-byte-compile
:help ,(purecopy "Byte compile the file containing the current buffer")))
(define-key menu-map [separator-eval] menu-bar-separator)
(define-key menu-map [ielm]
......@@ -509,7 +509,7 @@ if that value is non-nil."
`(menu-item ,(purecopy "Evaluate Defun") eval-defun
:help ,(purecopy "Evaluate the top-level form containing point, or after point")))
(define-key menu-map [eval-print-last-sexp]
`(menu-item ,(purecopy "Evaluate and print") eval-print-last-sexp
`(menu-item ,(purecopy "Evaluate and Print") eval-print-last-sexp
:help ,(purecopy "Evaluate sexp before point; print value into current buffer")))
(define-key menu-map [edebug-defun-lisp-interaction]
`(menu-item ,(purecopy "Instrument Function for Debugging") edebug-defun
......
......@@ -1297,30 +1297,30 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
'(menu-item "Unmark" package-menu-mark-unmark
:help "Clear any marks on a package and move to the next line"))
(define-key menu-map [munm]
'(menu-item "Unmark backwards" package-menu-backup-unmark
'(menu-item "Unmark Backwards" package-menu-backup-unmark
:help "Back up one line and clear any marks on that package"))
(define-key menu-map [md]
'(menu-item "Mark for deletion" package-menu-mark-delete
'(menu-item "Mark for Deletion" package-menu-mark-delete
:help "Mark a package for deletion and move to the next line"))
(define-key menu-map [mi]
'(menu-item "Mark for install" package-menu-mark-install
'(menu-item "Mark for Install" package-menu-mark-install
:help "Mark a package for installation and move to the next line"))
(define-key menu-map [mupgrades]
'(menu-item "Mark upgradable packages" package-menu-mark-upgrades
'(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades
:help "Mark packages that have a newer version for upgrading"))
(define-key menu-map [s3] '("--"))
(define-key menu-map [mg]
'(menu-item "Update package list" revert-buffer
'(menu-item "Update Package List" revert-buffer
:help "Update the list of packages"))
(define-key menu-map [mr]
'(menu-item "Refresh package list" package-menu-refresh
'(menu-item "Refresh Package List" package-menu-refresh
:help "Download the ELPA archive"))
(define-key menu-map [s4] '("--"))
(define-key menu-map [mt]
'(menu-item "Mark obsolete packages" package-menu-mark-obsolete-for-deletion
'(menu-item "Mark Obsolete Packages" package-menu-mark-obsolete-for-deletion
:help "Mark all obsolete packages for deletion"))
(define-key menu-map [mx]
'(menu-item "Execute actions" package-menu-execute
'(menu-item "Execute Actions" package-menu-execute
:help "Perform all the marked actions"))
(define-key menu-map [s5] '("--"))
(define-key menu-map [mh]
......
......@@ -239,7 +239,7 @@ You should bind this variable with `let', but do not set it globally.")
:help "Encrypt FILE for RECIPIENTS"))
(define-key menu-map [separator-epa-key-list] '(menu-item "--"))
(define-key menu-map [epa-key-list-delete-keys]
'(menu-item "Delete keys" epa-delete-keys
'(menu-item "Delete Keys" epa-delete-keys
:help "Delete Marked Keys"))
(define-key menu-map [epa-key-list-import-keys]
'(menu-item "Import Keys" epa-import-keys
......
......@@ -985,7 +985,7 @@ by \"Save Options\" in Custom buffers.")
(let ((menu (make-sparse-keymap "Tool-bar")))
(define-key menu [showhide-tool-bar-left]
`(menu-item ,(purecopy "On the left")
`(menu-item ,(purecopy "On the Left")
menu-bar-showhide-tool-bar-menu-customize-enable-left
:help ,(purecopy "Tool-bar at the left side")
:visible (display-graphic-p)
......@@ -997,7 +997,7 @@ by \"Save Options\" in Custom buffers.")
'left)))))
(define-key menu [showhide-tool-bar-right]
`(menu-item ,(purecopy "On the right")
`(menu-item ,(purecopy "On the Right")
menu-bar-showhide-tool-bar-menu-customize-enable-right
:help ,(purecopy "Tool-bar at the right side")
:visible (display-graphic-p)
......@@ -1009,7 +1009,7 @@ by \"Save Options\" in Custom buffers.")
'right)))))
(define-key menu [showhide-tool-bar-bottom]
`(menu-item ,(purecopy "On the bottom")
`(menu-item ,(purecopy "On the Bottom")
menu-bar-showhide-tool-bar-menu-customize-enable-bottom
:help ,(purecopy "Tool-bar at the bottom")
:visible (display-graphic-p)
......@@ -1021,7 +1021,7 @@ by \"Save Options\" in Custom buffers.")
'bottom)))))
(define-key menu [showhide-tool-bar-top]
`(menu-item ,(purecopy "On the top")
`(menu-item ,(purecopy "On the Top")
menu-bar-showhide-tool-bar-menu-customize-enable-top
:help ,(purecopy "Tool-bar at the top")
:visible (display-graphic-p)
......@@ -1200,7 +1200,7 @@ mail status in mode line"))
(define-key menu [menu-system-font]
(menu-bar-make-toggle
toggle-use-system-font font-use-system-font
"Use system font"
"Use System Font"
"Use system font: %s"
"Use the monospaced font defined by the system")))
......@@ -1304,7 +1304,7 @@ mail status in mode line"))
(eq 'turn-on-auto-fill text-mode-hook)))))
(define-key menu [line-wrapping]
`(menu-item ,(purecopy "Line Wrapping in this Buffer")
`(menu-item ,(purecopy "Line Wrapping in This Buffer")
,menu-bar-line-wrapping-menu))
......
......@@ -137,24 +137,23 @@ in the file it applies to."
(cons "Headings" (make-sparse-keymap "Headings")))
(define-key map [headings demote-subtree]
'(menu-item "Demote subtree" outline-demote
'(menu-item "Demote Subtree" outline-demote
:help "Demote headings lower down the tree"))
(define-key map [headings promote-subtree]
'(menu-item "Promote subtree" outline-promote
'(menu-item "Promote Subtree" outline-promote
:help "Promote headings higher up the tree"))
(define-key map [headings move-subtree-down]
'(menu-item "Move subtree down" outline-move-subtree-down
'(menu-item "Move Subtree Down" outline-move-subtree-down
:help "Move the currrent subtree down past arg headlines of the same level"))
(define-key map [headings move-subtree-up]
'(menu-item "Move subtree up" outline-move-subtree-up
'(menu-item "Move Subtree Up" outline-move-subtree-up
:help "Move the currrent subtree up past arg headlines of the same level"))
(define-key map [headings copy]
'(menu-item "Copy to kill ring" outline-headers-as-kill
'(menu-item "Copy to Kill Ring" outline-headers-as-kill
:enable mark-active
:help "Save the visible outline headers in region at the start of the kill ring"))
(define-key map [headings outline-insert-heading]
'(menu-item "New heading" outline-insert-heading
'(menu-item "New Heading" outline-insert-heading
:help "Insert a new heading at same depth at point"))
(define-key map [headings outline-backward-same-level]
......
......@@ -964,23 +964,23 @@ stream. Standard error output is discarded."
(defvar vc-bzr-shelve-menu-map
(let ((map (make-sparse-keymap "Bzr Shelve")))
(define-key map [de]
'(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
'(menu-item "Delete Shelf" vc-bzr-shelve-delete-at-point
:help "Delete the current shelf"))
(define-key map [ap]
'(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point
'(menu-item "Apply and Keep Shelf" vc-bzr-shelve-apply-and-keep-at-point
:help "Apply the current shelf and keep it"))
(define-key map [po]
'(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
'(menu-item "Apply and Remove Shelf (Pop)" vc-bzr-shelve-apply-at-point
:help "Apply the current shelf and remove it"))
(define-key map [sh]
'(menu-item "Show shelve" vc-bzr-shelve-show-at-point
'(menu-item "Show Shelve" vc-bzr-shelve-show-at-point
:help "Show the contents of the current shelve"))
map))
(defvar vc-bzr-extra-menu-map
(let ((map (make-sparse-keymap)))
(define-key map [bzr-sn]
'(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot
'(menu-item "Shelve a Snapshot" vc-bzr-shelve-snapshot
:help "Shelve the current state of the tree and keep the current state"))
(define-key map [bzr-sh]
'(menu-item "Shelve..." vc-bzr-shelve
......
......@@ -125,15 +125,15 @@ See `run-hooks'."
:enable (not (vc-dir-busy))
:help "Refresh the contents of the directory buffer"))
(define-key map [remup]
'(menu-item "Hide up-to-date" vc-dir-hide-up-to-date
'(menu-item "Hide Up-to-date" vc-dir-hide-up-to-date
:help "Hide up-to-date items from display"))
;; Movement.
(define-key map [sepmv] '("--"))
(define-key map [next-line]
'(menu-item "Next line" vc-dir-next-line
'(menu-item "Next Line" vc-dir-next-line
:help "Go to the next line" :keys "n"))
(define-key map [previous-line]
'(menu-item "Previous line" vc-dir-previous-line
'(menu-item "Previous Line" vc-dir-previous-line
:help "Go to the previous line"))
;; Marking.
(define-key map [sepmrk] '("--"))
......@@ -142,7 +142,7 @@ See `run-hooks'."
:help "Unmark all files that are in the same state as the current file\
\nWith prefix argument unmark all files"))
(define-key map [unmark-previous]
'(menu-item "Unmark previous " vc-dir-unmark-file-up
'(menu-item "Unmark Previous " vc-dir-unmark-file-up
:help "Move to the previous line and unmark the file"))
(define-key map [mark-all]
......@@ -171,10 +171,10 @@ See `run-hooks'."
'(menu-item "Isearch Files..." vc-dir-isearch
:help "Incremental search a string in the marked files"))
(define-key map [open-other]
'(menu-item "Open in other window" vc-dir-find-file-other-window
'(menu-item "Open in Other Window" vc-dir-find-file-other-window
:help "Find the file on the current line, in another window"))
(define-key map [open]
'(menu-item "Open file" vc-dir-find-file
'(menu-item "Open File" vc-dir-find-file
:help "Find the file on the current line"))
(define-key map [sepvcdet] '("--"))
;; FIXME: This needs a key binding. And maybe a better name
......@@ -203,10 +203,10 @@ See `run-hooks'."
;; VC commands.
(define-key map [sepvccmd] '("--"))
(define-key map [update]
'(menu-item "Update to latest version" vc-update
'(menu-item "Update to Latest Version" vc-update
:help "Update the current fileset's files to their tip revisions"))
(define-key map [revert]
'(menu-item "Revert to base version" vc-revert
'(menu-item "Revert to Base Version" vc-revert
:help "Revert working copies of the selected fileset to their repository contents."))
(define-key map [next-action]
;; FIXME: This really really really needs a better name!
......
......@@ -486,16 +486,16 @@ or an empty string if none."
(defvar vc-git-stash-menu-map
(let ((map (make-sparse-keymap "Git Stash")))
(define-key map [de]
'(menu-item "Delete stash" vc-git-stash-delete-at-point
'(menu-item "Delete Stash" vc-git-stash-delete-at-point
:help "Delete the current stash"))
(define-key map [ap]
'(menu-item "Apply stash" vc-git-stash-apply-at-point
'(menu-item "Apply Stash" vc-git-stash-apply-at-point
:help "Apply the current stash and keep it in the stash list"))
(define-key map [po]
'(menu-item "Apply and remove stash (pop)" vc-git-stash-pop-at-point
'(menu-item "Apply and Remove Stash (Pop)" vc-git-stash-pop-at-point
:help "Apply the current stash and remove it"))
(define-key map [sh]
'(menu-item "Show stash" vc-git-stash-show-at-point
'(menu-item "Show Stash" vc-git-stash-show-at-point
:help "Show the contents of the current stash"))
map))
......@@ -933,7 +933,7 @@ or BRANCH^ (where \"^\" can be repeated)."
'(menu-item "Git grep..." vc-git-grep
:help "Run the `git grep' command"))
(define-key map [git-sn]
'(menu-item "Stash a snapshot" vc-git-stash-snapshot
'(menu-item "Stash a Snapshot" vc-git-stash-snapshot
:help "Stash the current state of the tree and keep the current state"))
(define-key map [git-st]
'(menu-item "Create Stash..." vc-git-stash
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment