aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/elec-pair.el2
-rw-r--r--lisp/vc/vc-git.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index db812c9e121..205ad7e488b 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -499,7 +499,7 @@ happened."
499 (not (funcall electric-pair-inhibit-predicate 499 (not (funcall electric-pair-inhibit-predicate
500 last-command-event)))) 500 last-command-event))))
501 (save-excursion (electric-pair--insert pair))))) 501 (save-excursion (electric-pair--insert pair)))))
502 (t 502 (_
503 (when (and (if (functionp electric-pair-open-newline-between-pairs) 503 (when (and (if (functionp electric-pair-open-newline-between-pairs)
504 (funcall electric-pair-open-newline-between-pairs) 504 (funcall electric-pair-open-newline-between-pairs)
505 electric-pair-open-newline-between-pairs) 505 electric-pair-open-newline-between-pairs)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e3cd5d4e3dc..9522328cae8 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -308,12 +308,12 @@ matching the resulting Git log output, and KEYWORDS is a list of
308 (pcase old-type 308 (pcase old-type
309 (?\100 " (type change file -> symlink)") 309 (?\100 " (type change file -> symlink)")
310 (?\160 " (type change subproject -> symlink)") 310 (?\160 " (type change subproject -> symlink)")
311 (t " (symlink)"))) 311 (_ " (symlink)")))
312 (?\160 ;; Subproject. 312 (?\160 ;; Subproject.
313 (pcase old-type 313 (pcase old-type
314 (?\100 " (type change file -> subproject)") 314 (?\100 " (type change file -> subproject)")
315 (?\120 " (type change symlink -> subproject)") 315 (?\120 " (type change symlink -> subproject)")
316 (t " (subproject)"))) 316 (_ " (subproject)")))
317 (?\110 nil) ;; Directory (internal, not a real git state). 317 (?\110 nil) ;; Directory (internal, not a real git state).
318 (?\000 ;; Deleted or unknown. 318 (?\000 ;; Deleted or unknown.
319 (pcase old-type 319 (pcase old-type