From fd64ee5713a2e6618c7f47742b24aa618db53d6f Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Tue, 18 Aug 2009 14:05:32 +0200 Subject: [PATCH] stgit.el: Consistently use "marked" about marked patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Organization: Straylight/Edgeware From: Gustav HÃ¥llberg Signed-off-by: Gustav HÃ¥llberg --- contrib/stgit.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/stgit.el b/contrib/stgit.el index 7a3b267..b7c4b7f 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -677,7 +677,7 @@ (defun stgit-find-file (&optional other-window) (smerge-mode 1)))) (defun stgit-expand (&optional patches collapse) - "Show the contents selected patches, or the patch at point. + "Show the contents of marked patches, or the patch at point. See also `stgit-collapse'. @@ -697,7 +697,7 @@ (defun stgit-expand (&optional patches collapse) (move-to-column (stgit-goal-column))) (defun stgit-collapse (&optional patches) - "Hide the contents selected patches, or the patch at point. + "Hide the contents of marked patches, or the patch at point. See also `stgit-expand'." (interactive (list (stgit-patches-marked-or-at-point t))) @@ -911,17 +911,17 @@ (unless stgit-mode-map "-" ["Move patches" stgit-move-patches :active stgit-marked-patches - :help "Move selected patch(es) to point"] + :help "Move marked patch(es) to point"] ["Squash patches" stgit-squash :active (> (length stgit-marked-patches) 1) - :help "Merge selected patches into one"] + :help "Merge marked patches into one"] "-" ["Refresh top patch" stgit-refresh :active (not (and (stgit-index-empty-p) (stgit-work-tree-empty-p))) :help "Refresh the top patch with changes in index or work tree"] ["Refresh this patch" (stgit-refresh t) :keys "\\[universal-argument] \\[stgit-refresh]" - :help "Refresh the patch at point with changes in index or work tree" + :help "Refresh marked patch with changes in index or work tree" :active (and (not (and (stgit-index-empty-p) (stgit-work-tree-empty-p))) (stgit-patch-name-at-point nil t))] @@ -1011,8 +1011,8 @@ (defun stgit-mode () \\[stgit-refresh] Refresh patch with changes in index or work tree \\[stgit-diff] Show the patch log and diff -\\[stgit-expand] Show changes in selected patches -\\[stgit-collapse] Hide changes in selected patches +\\[stgit-expand] Show changes in marked patches +\\[stgit-collapse] Hide changes in marked patches \\[stgit-new] Create a new, empty patch \\[stgit-new-and-refresh] Create a new patch from index or work tree -- [mdw]