Commit 7b6a9801 authored by Kyle Meyer's avatar Kyle Meyer

protect doc-string apostrophes

As of Emacs 25, single quotes in doc-strings are rendered according to
text-quoting-style.  Protect code snippets in doc-strings that use an
apostrophe for quoting objects to prevent these cases from being
displayed as curved quotes.
parent 583d2c17
......@@ -243,8 +243,8 @@ This popup is intended as a replacement for the separate popups
`magit-pull-popup' and `magit-fetch-popup'. To use it, add this
to your init file:
(with-eval-after-load 'magit-remote
(define-key magit-mode-map \"f\" 'magit-pull-and-fetch-popup)
(with-eval-after-load \\='magit-remote
(define-key magit-mode-map \"f\" \\='magit-pull-and-fetch-popup)
(define-key magit-mode-map \"F\" nil))
The combined popup does not offer all commands and arguments
......@@ -254,13 +254,13 @@ available from the individual popups. Instead of the argument
`magit-fetch-from-pushremote' and `magit-fetch-from-upstream' are
missing. To add them use something like:
(with-eval-after-load 'magit-remote
(magit-define-popup-action 'magit-pull-and-fetch-popup ?U
'magit-get-upstream-branch
'magit-fetch-from-upstream-remote ?F)
(magit-define-popup-action 'magit-pull-and-fetch-popup ?P
'magit-get-push-branch
'magit-fetch-from-push-remote ?F))"
(with-eval-after-load \\='magit-remote
(magit-define-popup-action \\='magit-pull-and-fetch-popup ?U
\\='magit-get-upstream-branch
\\='magit-fetch-from-upstream-remote ?F)
(magit-define-popup-action \\='magit-pull-and-fetch-popup ?P
\\='magit-get-push-branch
\\='magit-fetch-from-push-remote ?F))"
'magit-commands
:man-page "git-pull"
:variables '("Pull variables"
......
......@@ -668,10 +668,10 @@ remote in alphabetic order."
To make this command available use something like:
(add-hook 'ido-setup-hook
(add-hook \\='ido-setup-hook
(lambda ()
(define-key ido-completion-map
(kbd \"C-x g\") 'ido-enter-magit-status)))
(kbd \"C-x g\") \\='ido-enter-magit-status)))
Starting with Emacs 25.1 the Ido keymaps are defined just once
instead of every time Ido is invoked, so now you can modify it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment