Skip to content

Conversation

@bmag
Copy link

@bmag bmag commented Dec 7, 2015

Add two faces - one for keys and one for commands.
You might want to adjust the faces' default values. They work fine with the theme I'm using, but not with the default emacs theme.

Implements #7

Add two faces - one for keys and one for commands.
@stardiviner
Copy link

+1 good job

@bmag
Copy link
Author

bmag commented Feb 4, 2016

@lewang did you see this?

@emacs18
Copy link

emacs18 commented Dec 14, 2019

@bmag Could you resolve the conflict so that your change can be checked into this git repo so that spacemacs can use this repo instead of your custom repo?

I took a shot and tried to resolve the conflict as shown below.
The conflict is just in one line.

                 (insert (propertize (format "%s" (if (byte-code-function-p cmd) "<bytecode>" cmd))
                                     'face 'command-log-command))

@bmag
Copy link
Author

bmag commented Dec 22, 2019

@emacs18 your resolution looks correct to me. Is there anyone that will merge this PR if I resolve the conflict?

pierre-rouleau added a commit to pierre-rouleau/command-log-mode that referenced this pull request Nov 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants