branch: elpa/magit
commit fcd2907fca0921c5338808e28427d7ca2649479c
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Use Cond-Let's implementations of {if,when,and,while}-let{,*}
Cond-Let's `if-let', `if-let*', `when-let', `when-let*' and `and-let*'
implementations behave differently from the built-in implementations,
but because I have been careful not to depend on the idiosyncrasies,
switching over should be mostly safe.
Also add shorthands for the other `cond-let--...' macros. We will
start using those (and `cond-let' and `cond-let*') in later commits.
---
lisp/git-commit.el | 8 +++++++-
lisp/git-rebase.el | 8 +++++++-
lisp/magit-apply.el | 8 +++++++-
lisp/magit-autorevert.el | 8 +++++++-
lisp/magit-base.el | 8 +++++++-
lisp/magit-bisect.el | 8 +++++++-
lisp/magit-blame.el | 8 +++++++-
lisp/magit-bookmark.el | 8 +++++++-
lisp/magit-branch.el | 8 +++++++-
lisp/magit-bundle.el | 8 +++++++-
lisp/magit-clone.el | 8 +++++++-
lisp/magit-commit.el | 8 +++++++-
lisp/magit-core.el | 8 +++++++-
lisp/magit-diff.el | 8 +++++++-
lisp/magit-dired.el | 8 +++++++-
lisp/magit-ediff.el | 8 +++++++-
lisp/magit-extras.el | 8 +++++++-
lisp/magit-fetch.el | 8 +++++++-
lisp/magit-files.el | 8 +++++++-
lisp/magit-git.el | 8 +++++++-
lisp/magit-gitignore.el | 8 +++++++-
lisp/magit-log.el | 18 ++++++++++++------
lisp/magit-margin.el | 8 +++++++-
lisp/magit-merge.el | 8 +++++++-
lisp/magit-mode.el | 8 +++++++-
lisp/magit-notes.el | 8 +++++++-
lisp/magit-patch.el | 8 +++++++-
lisp/magit-process.el | 8 +++++++-
lisp/magit-pull.el | 8 +++++++-
lisp/magit-push.el | 8 +++++++-
lisp/magit-reflog.el | 8 +++++++-
lisp/magit-refs.el | 8 +++++++-
lisp/magit-remote.el | 8 +++++++-
lisp/magit-repos.el | 8 +++++++-
lisp/magit-reset.el | 8 +++++++-
lisp/magit-section.el | 8 +++++++-
lisp/magit-sequence.el | 8 +++++++-
lisp/magit-sparse-checkout.el | 8 +++++++-
lisp/magit-stash.el | 8 +++++++-
lisp/magit-status.el | 8 +++++++-
lisp/magit-submodule.el | 8 +++++++-
lisp/magit-subtree.el | 8 +++++++-
lisp/magit-tag.el | 8 +++++++-
lisp/magit-transient.el | 8 +++++++-
lisp/magit-wip.el | 8 +++++++-
lisp/magit-worktree.el | 8 +++++++-
lisp/magit.el | 8 +++++++-
47 files changed, 334 insertions(+), 52 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 6494e413327..b0770588713 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -1220,7 +1220,13 @@ Elisp doc-strings, including this one. Unlike in
doc-strings,
(provide 'git-commit)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; git-commit.el ends here
diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index eec7d4d4ee5..8681e9d1c15 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -946,7 +946,13 @@ is used as a value for
`imenu-extract-index-name-function'."
(provide 'git-rebase)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; git-rebase.el ends here
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 0bbe1d03e53..fff23de8ef4 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -832,7 +832,13 @@ a separate commit. A typical workflow would be:
(provide 'magit-apply)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-apply.el ends here
diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index 6d2f799a002..90d833673c6 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -270,7 +270,13 @@ defaults to nil) for any BUFFER."
(provide 'magit-autorevert)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-autorevert.el ends here
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index fbae65c6b20..7e5a69b9b53 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -1187,7 +1187,13 @@ Like `message', except that `message-log-max' is bound
to nil."
(provide 'magit-base)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-base.el ends here
diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el
index baf1428c0ac..6496510f90a 100644
--- a/lisp/magit-bisect.el
+++ b/lisp/magit-bisect.el
@@ -317,7 +317,13 @@ bisect run'."
(provide 'magit-bisect)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-bisect.el ends here
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 8b58bf019b5..1e5f340cd05 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -999,7 +999,13 @@ instead of the hash, like `kill-ring-save' would."
(provide 'magit-blame)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-blame.el ends here
diff --git a/lisp/magit-bookmark.el b/lisp/magit-bookmark.el
index 5bb1020679f..8ded15f7399 100644
--- a/lisp/magit-bookmark.el
+++ b/lisp/magit-bookmark.el
@@ -158,7 +158,13 @@
(provide 'magit-bookmark)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-bookmark.el ends here
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 8e9cc263cf6..29d8e17cdba 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -981,7 +981,13 @@ Also rename the respective reflog file."
(provide 'magit-branch)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-branch.el ends here
diff --git a/lisp/magit-bundle.el b/lisp/magit-bundle.el
index 7f44d247bc6..5c73957537a 100644
--- a/lisp/magit-bundle.el
+++ b/lisp/magit-bundle.el
@@ -138,7 +138,13 @@
(provide 'magit-bundle)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-bundle.el ends here
diff --git a/lisp/magit-clone.el b/lisp/magit-clone.el
index bc595429efe..dc7c827c761 100644
--- a/lisp/magit-clone.el
+++ b/lisp/magit-clone.el
@@ -350,7 +350,13 @@ Then show the status buffer for the new repository."
(provide 'magit-clone)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-clone.el ends here
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 7aab4f3eea5..e8607c04f0c 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -815,7 +815,13 @@ actually insert the entry."
(provide 'magit-commit)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-commit.el ends here
diff --git a/lisp/magit-core.el b/lisp/magit-core.el
index dd952280dee..0ea2385c380 100644
--- a/lisp/magit-core.el
+++ b/lisp/magit-core.el
@@ -122,7 +122,13 @@ Each of these options falls into one or more of these
categories:
(provide 'magit-core)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-core.el ends here
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 1ccfb0db2bc..0fc268528ee 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -3643,7 +3643,13 @@ last (visual) lines of the region."
(provide 'magit-diff)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-diff.el ends here
diff --git a/lisp/magit-dired.el b/lisp/magit-dired.el
index 986102562f7..2f55fbddfc7 100644
--- a/lisp/magit-dired.el
+++ b/lisp/magit-dired.el
@@ -110,7 +110,13 @@ Interactively, open the file at point."
(provide 'magit-dired)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-dired.el ends here
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 3630b357d26..cddcc7f041d 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -604,7 +604,13 @@ stash that were staged."
(provide 'magit-ediff)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-ediff.el ends here
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index c22feafe5ab..8325c1c01f4 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -834,7 +834,13 @@ In Magit diffs, also skip over - and + at the beginning of
the line."
(provide 'magit-extras)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-extras.el ends here
diff --git a/lisp/magit-fetch.el b/lisp/magit-fetch.el
index 7e56849a8e9..530b662fe53 100644
--- a/lisp/magit-fetch.el
+++ b/lisp/magit-fetch.el
@@ -185,7 +185,13 @@ with a prefix argument."
(provide 'magit-fetch)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-fetch.el ends here
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 2fa95ad7621..258c28fd6d5 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -607,7 +607,13 @@ If DEFAULT is non-nil, use this as the default value
instead of
(provide 'magit-files)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-files.el ends here
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 09537e84151..87a8b107b64 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -2911,7 +2911,13 @@ out. Only existing branches can be selected."
(provide 'magit-git)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-git.el ends here
diff --git a/lisp/magit-gitignore.el b/lisp/magit-gitignore.el
index 62b0ef5c7f4..7af73f967e0 100644
--- a/lisp/magit-gitignore.el
+++ b/lisp/magit-gitignore.el
@@ -194,7 +194,13 @@ Rules that are defined in that file affect all local
repositories."
(provide 'magit-gitignore)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-gitignore.el ends here
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 49f8a08df7a..237e3410e1a 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1763,11 +1763,11 @@ Type \\[magit-log-select-quit] to abort without
selecting a commit."
(car (magit-log--get-value 'magit-log-select-mode 'direct))))
(if initial
(magit-log-goto-commit-section initial)
- (while-let ((rev (magit-section-value-if 'commit))
- (_(string-match-p "\\`\\(squash!\\|fixup!\\|amend!\\)"
- (magit-rev-format "%s" rev)))
- (section (magit-current-section))
- (next (car (magit-section-siblings section 'next))))
+ (while-let* ((rev (magit-section-value-if 'commit))
+ (_(string-match-p "\\`\\(squash!\\|fixup!\\|amend!\\)"
+ (magit-rev-format "%s" rev)))
+ (section (magit-current-section))
+ (next (car (magit-section-siblings section 'next))))
(magit-section-goto next)))
(setq magit-log-select-pick-function pick)
(setq magit-log-select-quit-function quit)
@@ -2066,7 +2066,13 @@ all others with \"-\"."
(provide 'magit-log)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-log.el ends here
diff --git a/lisp/magit-margin.el b/lisp/magit-margin.el
index 74bfedca3e4..1426aee685c 100644
--- a/lisp/magit-margin.el
+++ b/lisp/magit-margin.el
@@ -252,7 +252,13 @@ English.")
(provide 'magit-margin)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-margin.el ends here
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 47865af44ab..91cc55f02bb 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -314,7 +314,13 @@ If no merge is in progress, do nothing."
(provide 'magit-merge)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-merge.el ends here
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 0ce82337f8b..a477d680c26 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -1595,7 +1595,13 @@ line. Avoid including the line after the end of the
file."
(provide 'magit-mode)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-mode.el ends here
diff --git a/lisp/magit-notes.el b/lisp/magit-notes.el
index 5590b88ed45..6ad91fc25ab 100644
--- a/lisp/magit-notes.el
+++ b/lisp/magit-notes.el
@@ -200,7 +200,13 @@ Also see `magit-notes-merge'."
(provide 'magit-notes)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-notes.el ends here
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index 4c1b44f2605..1bdaa863993 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -326,7 +326,13 @@ is asked to pull. START has to be reachable from that
commit."
(provide 'magit-patch)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-patch.el ends here
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index ccdd98dbef9..aae3abfc257 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -1346,7 +1346,13 @@ Limited by `magit-process-error-tooltip-max-lines'."
(provide 'magit-process)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-process.el ends here
diff --git a/lisp/magit-pull.el b/lisp/magit-pull.el
index 23b10586335..12f80860166 100644
--- a/lisp/magit-pull.el
+++ b/lisp/magit-pull.el
@@ -165,7 +165,13 @@ the upstream."
(provide 'magit-pull)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-pull.el ends here
diff --git a/lisp/magit-push.el b/lisp/magit-push.el
index 4b8f221f1d4..f5ff91acd88 100644
--- a/lisp/magit-push.el
+++ b/lisp/magit-push.el
@@ -372,7 +372,13 @@ You can add this command as a suffix using something like:
(provide 'magit-push)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-push.el ends here
diff --git a/lisp/magit-reflog.el b/lisp/magit-reflog.el
index 51636867f03..4399ea21ff8 100644
--- a/lisp/magit-reflog.el
+++ b/lisp/magit-reflog.el
@@ -207,7 +207,13 @@ Type \\[magit-reset] to reset `HEAD' to the commit at
point.
(provide 'magit-reflog)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-reflog.el ends here
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el
index 6b29c236e8a..858f6f62485 100644
--- a/lisp/magit-refs.el
+++ b/lisp/magit-refs.el
@@ -813,7 +813,13 @@ line is inserted at all."
(provide 'magit-refs)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-refs.el ends here
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index 6822fac0f01..afcaeea47ef 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -395,7 +395,13 @@ refspec."
(provide 'magit-remote)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-remote.el ends here
diff --git a/lisp/magit-repos.el b/lisp/magit-repos.el
index 497df494712..8a21fc6e3fb 100644
--- a/lisp/magit-repos.el
+++ b/lisp/magit-repos.el
@@ -548,7 +548,13 @@ instead."
(provide 'magit-repos)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-repos.el ends here
diff --git a/lisp/magit-reset.el b/lisp/magit-reset.el
index 5b099fc8926..4e8af09c595 100644
--- a/lisp/magit-reset.el
+++ b/lisp/magit-reset.el
@@ -136,7 +136,13 @@ or \"detached head\" will be substituted for %s."
(provide 'magit-reset)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-reset.el ends here
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index c1911d7d799..df23254633c 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -2609,7 +2609,13 @@ with the variables' values as arguments, which were
recorded by
(provide 'magit-section)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-section.el ends here
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 78c29987108..26bce1b5989 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -1143,7 +1143,13 @@ status buffer (i.e., the reverse of how they will be
applied)."
(provide 'magit-sequence)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-sequence.el ends here
diff --git a/lisp/magit-sparse-checkout.el b/lisp/magit-sparse-checkout.el
index e4fb663a9c7..b83eae996e9 100644
--- a/lisp/magit-sparse-checkout.el
+++ b/lisp/magit-sparse-checkout.el
@@ -157,7 +157,13 @@ This header is not inserted by default. To enable it, add
it to
(provide 'magit-sparse-checkout)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-sparse-checkout.el ends here
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 0296528e494..1449a128db4 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -683,7 +683,13 @@ that make up the stash."
(provide 'magit-stash)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-stash.el ends here
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index 39274352065..2442ee73f2e 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -819,7 +819,13 @@ Honor the buffer's file filter, which can be set using \"D
- -\"."
(provide 'magit-status)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-status.el ends here
diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el
index 2702d22b5ec..589e81b66c9 100644
--- a/lisp/magit-submodule.el
+++ b/lisp/magit-submodule.el
@@ -715,7 +715,13 @@ These sections can be expanded to show the respective
commits."
(provide 'magit-submodule)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-submodule.el ends here
diff --git a/lisp/magit-subtree.el b/lisp/magit-subtree.el
index 0ad655a2613..5f2bf3c5286 100644
--- a/lisp/magit-subtree.el
+++ b/lisp/magit-subtree.el
@@ -186,7 +186,13 @@
(provide 'magit-subtree)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-subtree.el ends here
diff --git a/lisp/magit-tag.el b/lisp/magit-tag.el
index d7e1800fd4d..0cb7517bc8b 100644
--- a/lisp/magit-tag.el
+++ b/lisp/magit-tag.el
@@ -247,7 +247,13 @@ a tag qualifies as a release tag."
(provide 'magit-tag)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-tag.el ends here
diff --git a/lisp/magit-transient.el b/lisp/magit-transient.el
index 2055117239d..d0f8490b182 100644
--- a/lisp/magit-transient.el
+++ b/lisp/magit-transient.el
@@ -232,7 +232,13 @@
(provide 'magit-transient)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-transient.el ends here
diff --git a/lisp/magit-wip.el b/lisp/magit-wip.el
index 758b1c8890b..22211c9e6fc 100644
--- a/lisp/magit-wip.el
+++ b/lisp/magit-wip.el
@@ -460,7 +460,13 @@ many \"branches\" of each wip ref are shown."
(provide 'magit-wip)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-wip.el ends here
diff --git a/lisp/magit-worktree.el b/lisp/magit-worktree.el
index 5bd97d9ac84..085f99b721e 100644
--- a/lisp/magit-worktree.el
+++ b/lisp/magit-worktree.el
@@ -296,7 +296,13 @@ with padding for alignment."
(provide 'magit-worktree)
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit-worktree.el ends here
diff --git a/lisp/magit.el b/lisp/magit.el
index 3a6a24e995d..5492be94dbb 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -799,7 +799,13 @@ For X11 something like ~/.xinitrc should work.\n"
;; Local Variables:
;; read-symbol-shorthands: (
+;; ("and$" . "cond-let--and$")
+;; ("and>" . "cond-let--and>")
+;; ("and-let" . "cond-let--and-let")
+;; ("if-let" . "cond-let--if-let")
+;; ("when-let" . "cond-let--when-let")
+;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
-;; ("match-str" . "match-string-no-properties"))
+;; ("match-str" . "match-string-no-properties"))
;; End:
;;; magit.el ends here
