Skip to content

Commit 02aeaec

Browse files
MorganJamesSmithjpgrayson
authored andcommitted
stgit.el: Fix some checkdoc warnings
1 parent 4397441 commit 02aeaec

File tree

1 file changed

+42
-43
lines changed

1 file changed

+42
-43
lines changed

contrib/stgit.el

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -236,65 +236,65 @@ format characters are recognized:
236236

237237
(defface stgit-branch-name-face
238238
'((t :inherit bold))
239-
"The face used for the StGit branch name"
239+
"The face used for the StGit branch name."
240240
:group 'stgit-faces)
241241

242242
(defface stgit-top-patch-face
243243
'((((background dark)) (:weight bold :foreground "yellow"))
244244
(((background light)) (:weight bold :foreground "purple"))
245245
(t (:weight bold)))
246-
"The face used for the top patch names"
246+
"The face used for the top patch names."
247247
:group 'stgit-faces)
248248

249249
(defface stgit-applied-patch-face
250250
'((((background dark)) (:foreground "light yellow"))
251251
(((background light)) (:foreground "purple"))
252252
(t ()))
253-
"The face used for applied patch names"
253+
"The face used for applied patch names."
254254
:group 'stgit-faces)
255255

256256
(defface stgit-unapplied-patch-face
257257
'((((background dark)) (:foreground "gray80"))
258258
(((background light)) (:foreground "orchid"))
259259
(t ()))
260-
"The face used for unapplied patch names"
260+
"The face used for unapplied patch names."
261261
:group 'stgit-faces)
262262

263263
(defface stgit-committed-patch-face
264264
'((((background dark)) (:foreground "gray50"))
265265
(((background light)) (:foreground "gray50"))
266266
(t ()))
267-
"The face used for already committed patch names"
267+
"The face used for already committed patch names."
268268
:group 'stgit-faces)
269269

270270
(defface stgit-description-face
271271
'((((background dark)) (:foreground "tan"))
272272
(((background light)) (:foreground "dark red")))
273-
"The face used for StGit descriptions"
273+
"The face used for StGit descriptions."
274274
:group 'stgit-faces)
275275

276276
(defface stgit-index-work-tree-title-face
277277
'((((supports :slant italic)) :slant italic)
278278
(t :inherit bold))
279-
"StGit mode face used for the \"Index\" and \"Work tree\" titles"
279+
"StGit mode face used for the \"Index\" and \"Work tree\" titles."
280280
:group 'stgit-faces)
281281

282282
(defface stgit-unmerged-file-face
283283
'((((class color) (background light)) (:foreground "red" :bold t))
284284
(((class color) (background dark)) (:foreground "red" :bold t)))
285-
"StGit mode face used for unmerged file status"
285+
"StGit mode face used for unmerged file status."
286286
:group 'stgit-faces)
287287

288288
(defface stgit-unknown-file-face
289289
'((((class color) (background light)) (:foreground "goldenrod" :bold t))
290290
(((class color) (background dark)) (:foreground "goldenrod" :bold t)))
291-
"StGit mode face used for unknown file status"
291+
"StGit mode face used for unknown file status."
292292
:group 'stgit-faces)
293293

294294
(defface stgit-ignored-file-face
295295
'((((class color) (background light)) (:foreground "grey60"))
296296
(((class color) (background dark)) (:foreground "grey40")))
297-
"StGit mode face used for ignored files")
297+
"StGit mode face used for ignored files.")
298298

299299
(defface stgit-file-permission-face
300300
'((((class color) (background light)) (:foreground "green" :bold t))
@@ -305,7 +305,7 @@ format characters are recognized:
305305
(defface stgit-modified-file-face
306306
'((((class color) (background light)) (:foreground "purple"))
307307
(((class color) (background dark)) (:foreground "salmon")))
308-
"StGit mode face used for modified file status"
308+
"StGit mode face used for modified file status."
309309
:group 'stgit-faces)
310310

311311
(defun stgit (dir)
@@ -484,7 +484,7 @@ necessary and no message will be shown if MESSAGE is nil.
484484
485485
If `stgit-inhibit-messages' is non-nil, messages are
486486
suppressed. See also `stgit-message'. If MESSAGE is non-nil, BODY
487-
will be executed with `stgit-inhibit-messages' set to `t'.
487+
will be executed with `stgit-inhibit-messages' set to t.
488488
489489
Returns the return value of BODY."
490490
(declare (indent 1) (debug (form body)))
@@ -586,8 +586,8 @@ default) that can be used to restore the point using
586586
column)))))
587587

588588
(defun stgit-get-window-state ()
589-
"Return the state of the buffer and its windows. Use
590-
`stgit-restore-window-state' to restore the state."
589+
"Return the state of the buffer and its windows.
590+
Use `stgit-restore-window-state' to restore the state."
591591
(list (current-buffer)
592592
(mapcar (lambda (window)
593593
(cons window
@@ -800,7 +800,7 @@ during the operation."
800800
(unmerged "Unmerged" stgit-unmerged-file-face)
801801
(unknown "Unknown" stgit-unknown-file-face)
802802
(ignore "Ignored" stgit-ignored-file-face)))
803-
"Alist of code symbols to description strings")
803+
"Alist of code symbols to description strings.")
804804

805805
(defconst stgit-patch-status-face-alist
806806
'((applied . stgit-applied-patch-face)
@@ -809,10 +809,10 @@ during the operation."
809809
(committed . stgit-committed-patch-face)
810810
(index . stgit-index-work-tree-title-face)
811811
(work . stgit-index-work-tree-title-face))
812-
"Alist of face to use for a given patch status")
812+
"Alist of face to use for a given patch status.")
813813

814814
(defun stgit-file-status-code-as-string (file)
815-
"Return stgit status code for FILE as a string"
815+
"Return stgit status code for FILE as a string."
816816
(let* ((code (assq (stgit-file->status file)
817817
stgit-file-status-code-strings))
818818
(score (stgit-file->cr-score file)))
@@ -824,7 +824,7 @@ during the operation."
824824
(cdr code)))))
825825

826826
(defun stgit-file-status-code (str &optional score)
827-
"Return stgit status code from git status string"
827+
"Return stgit status code from git status string."
828828
(let ((code (assoc str '(("A" . add)
829829
("C" . copy)
830830
("D" . delete)
@@ -845,7 +845,7 @@ during the operation."
845845
'((#o100 . "file")
846846
(#o120 . "symlink")
847847
(#o160 . "subproject"))
848-
"Alist of names of file types")
848+
"Alist of names of file types.")
849849

850850
(defun stgit-file-type-string (type)
851851
"Return string describing file type TYPE (the high bits of file permission).
@@ -1104,7 +1104,7 @@ at point."
11041104
""
11051105
(stgit-id patchsym))
11061106
":" file)))
1107-
(error "git cat-file failed"))))
1107+
(error "Command 'git cat-file' failed"))))
11081108
(funcall (if other-window
11091109
'switch-to-buffer-other-window
11101110
'switch-to-buffer)
@@ -1210,7 +1210,7 @@ See also `stgit-expand'."
12101210
(defun stgit-select ()
12111211
"With point on a patch, toggle showing files in the patch.
12121212
1213-
With point on a file, open the associated file. Opens the target
1213+
With point on a file, open the associated file. Opens the target
12141214
file for (applied) copies and renames."
12151215
(interactive)
12161216
(stgit-assert-mode)
@@ -1257,21 +1257,21 @@ With prefix argument, open a buffer with that revision of the file."
12571257
(git-status dir))))
12581258

12591259
(defun stgit-goal-column ()
1260-
"Return goal column for the current line"
1260+
"Return goal column for the current line."
12611261
(case (get-text-property (point) 'entry-type)
12621262
('patch 2)
12631263
('file 4)
12641264
(t 0)))
12651265

12661266
(defun stgit-next-line (&optional arg)
1267-
"Move cursor vertically down ARG lines"
1267+
"Move cursor vertically down ARG lines."
12681268
(interactive "p")
12691269
(stgit-assert-mode)
12701270
(next-line arg)
12711271
(move-to-column (stgit-goal-column)))
12721272

12731273
(defun stgit-previous-line (&optional arg)
1274-
"Move cursor vertically up ARG lines"
1274+
"Move cursor vertically up ARG lines."
12751275
(interactive "p")
12761276
(stgit-assert-mode)
12771277
(previous-line arg)
@@ -1317,7 +1317,7 @@ With prefix argument, open a buffer with that revision of the file."
13171317
(defun stgit-previous-patch-group (&optional arg)
13181318
"Move to the previous group of patches.
13191319
1320-
If ARG is non-nil, do this ARG times. If ARG is negative, move
1320+
If ARG is non-nil, do this ARG times. If ARG is negative, move
13211321
-ARG groups forward instead; cf. `stgit-next-patch-group'."
13221322
(interactive "p")
13231323
(stgit-assert-mode)
@@ -1341,7 +1341,7 @@ If ARG is non-nil, do this ARG times. If ARG is negative, move
13411341
(defun stgit-next-patch-group (&optional arg)
13421342
"Move to the next group of patches.
13431343
1344-
If ARG is non-nil, do this ARG times. If ARG is negative, move
1344+
If ARG is non-nil, do this ARG times. If ARG is negative, move
13451345
-ARG groups backwards instead; cf. `stgit-previous-patch-group'."
13461346
(interactive "p")
13471347
(stgit-assert-mode)
@@ -1732,7 +1732,7 @@ refresh the stgit buffers as the git status of files change."
17321732

17331733
(defvar stgit-pending-refresh-buffers nil
17341734
"Alist of (`buffer' . `mode') of buffers that need to be
1735-
refreshed. See `stgit-post-refresh' for the different values of
1735+
refreshed. See `stgit-post-refresh' for the different values of
17361736
`mode'.")
17371737

17381738
(defun stgit-run-pending-refreshs ()
@@ -1782,7 +1782,7 @@ MODE specifies what to do:
17821782
"When Emacs becomes idle, update the status in any `stgit-mode'
17831783
buffer that shows the status of the current buffer.
17841784
1785-
MODE specifies how to update the buffer. See `stgit-post-refresh'
1785+
MODE specifies how to update the buffer. See `stgit-post-refresh'
17861786
for the different values MODE can have."
17871787
(let* ((dir (cond ((derived-mode-p 'stgit-mode 'stgit-status-mode 'dired-mode)
17881788
default-directory)
@@ -1887,7 +1887,7 @@ line of PATCHSYM and return :patch."
18871887
(stgit-assert-mode)
18881888
(unless (zerop (stgit-capture-output nil
18891889
(stgit-run "init")))
1890-
(error "stg init failed"))
1890+
(error "Command 'stg init' failed"))
18911891
(stgit-reload))
18921892

18931893
(defun stgit-toggle-mark ()
@@ -2078,8 +2078,8 @@ git-config setting branch.<branch>.stgit.parentbranch."
20782078
(defun stgit-rebase (new-base)
20792079
"Rebase the current branch to NEW-BASE.
20802080
2081-
Interactively, first ask which branch to rebase to. Defaults to
2082-
what git-config branch.<branch>.stgit.parentbranch is set to."
2081+
Interactively, first ask which branch to rebase to. Defaults to what
2082+
git-config branch.<branch>.stgit.parentbranch is set to."
20832083
(interactive (list (completing-read "Rebase to: "
20842084
(stgit-available-refs t)
20852085
nil nil
@@ -2342,7 +2342,7 @@ or :bottom."
23422342
(defun stgit-goto ()
23432343
"Go to the patch on the current line.
23442344
2345-
Push or pop patches to make this patch topmost. Push or pop all
2345+
Push or pop patches to make this patch topmost. Push or pop all
23462346
patches if used on a line after or before all patches."
23472347
(interactive)
23482348
(stgit-assert-mode)
@@ -2463,9 +2463,9 @@ greater than four (e.g., \\[universal-argument] \
24632463
(defun stgit-diff-range (&optional ignore-whitespace)
24642464
"Show diff for the range of patches between point and the marked patch.
24652465
2466-
With a prefix argument, ignore whitespace. With a prefix argument
2467-
greater than four (e.g., \\[universal-argument] \
2468-
\\[universal-argument] \\[stgit-diff-range]), ignore all whitespace."
2466+
With a prefix argument, ignore whitespace. With a prefix argument
2467+
greater than four (e.g., \\[universal-argument] \ \\[universal-argument]
2468+
\\[stgit-diff-range]), ignore all whitespace."
24692469
(interactive "p")
24702470
(stgit-assert-mode)
24712471
(unless (= (length stgit-marked-patches) 1)
@@ -2503,7 +2503,7 @@ If FORCE is not nil, use --force."
25032503
'("--") (list file))))))
25042504

25052505
(defun stgit-remove-change-from-index (file)
2506-
"Unstages the change in FILE from the index"
2506+
"Unstages the change in FILE from the index."
25072507
(stgit-capture-output "*git output*"
25082508
(stgit-run-git "reset" "-q" "--" file)))
25092509

@@ -2525,7 +2525,7 @@ If FORCE is not nil, use --force."
25252525
"Move modified file in or out of the index.
25262526
25272527
Leaves the point where it is, but moves the mark to where the
2528-
file ended up. You can then jump to the file with \
2528+
file ended up. You can then jump to the file with \
25292529
\\[exchange-point-and-mark]."
25302530
(interactive)
25312531
(stgit-assert-mode)
@@ -2564,7 +2564,7 @@ file ended up. You can then jump to the file with \
25642564
Works on index and work tree, as well as files in either.
25652565
25662566
Leaves the point where it is, but moves the mark to where the
2567-
file ended up. You can then jump to the file with \
2567+
file ended up. You can then jump to the file with \
25682568
\\[exchange-point-and-mark]."
25692569
(interactive)
25702570
(stgit-assert-mode)
@@ -2620,8 +2620,7 @@ file ended up. You can then jump to the file with \
26202620
(stgit-reload))))
26212621

26222622
(defun stgit-new-here (add-sign)
2623-
"Create a new patch before the patch at point, asking for a
2624-
commit message.
2623+
"Create a new patch before the patch at point, asking for a commit message.
26252624
26262625
With a prefix argument, include a \"Signed-off-by:\" line at the
26272626
end of the patch description.
@@ -2697,7 +2696,7 @@ This works just like running `stgit-new' followed by `stgit-refresh'."
26972696
(stgit-new add-sign t))
26982697

26992698
(defun stgit-create-patch-name (description)
2700-
"Create a patch name from a long description"
2699+
"Create a patch name from a long description."
27012700
(let ((patch ""))
27022701
(while (> (length description) 0)
27032702
(cond ((string-match "\\`[a-zA-Z_-]+" description)
@@ -2846,7 +2845,7 @@ deepest patch had before the squash."
28462845
(rename-buffer "*StGit error*")
28472846
(resize-temp-buffer-window)
28482847
(switch-to-buffer-other-window stgit-buffer)
2849-
(error "stg squash failed")))))
2848+
(error "Command 'stg squash' failed")))))
28502849

28512850
(defun stgit-confirm-squash ()
28522851
(interactive)
@@ -2955,7 +2954,7 @@ If HARD is non-nil, use the --hard flag."
29552954
(if arg
29562955
(when (or (and (stgit-index-empty-p)
29572956
(stgit-work-tree-empty-p))
2958-
(y-or-n-p (format "Hard %s may overwrite index/work tree changes. Continue? "
2957+
(y-or-n-p (format "Hard %s may overwrite index/work tree changes. Continue? "
29592958
cmd)))
29602959
(stgit-run cmd "--hard"))
29612960
(stgit-run cmd))))

0 commit comments

Comments
 (0)