stgit.el: Consistently use "marked" about marked patches

[stgit] / contrib / stgit.el

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 7a3b267e26b1df97e92f7f40a6cfefe62bc26a82..b7c4b7fc595edd8547322d7f469eaaf2c910034a 100644 (file)
--- 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)
       (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'.
 
 
 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)
   (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)))
 
 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
         "-"
         ["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)
         ["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]"
         "-"
         ["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))]
          :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-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
 
 \\[stgit-new]  Create a new, empty patch
 \\[stgit-new-and-refresh]      Create a new patch from index or work tree