Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emacs-exordium/exordium
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pkryger/exordium
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Feb 27, 2025

  1. fix(helm): Use original primary action when switching buffers

    The default (first) action in `helm-source-buffers` is
    `helm-buffer-switch-buffers`. With such a setup commands like
    `switch-to-buffer-other-window` switch to buffer both in the current and in
    the other window.
    
    This commit fixes this by copying the original action (only the first one!)
    from a source generated by `helm-comp-read`, followed by reminder of actions
    specific to a buffer as defined in `helm-source-buffers`.
    
    Also normalise sources before further processing. Although this is not strictly
    necessary in current version of `helm`, this is more future proof.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    5341bbd View commit details
  2. feat(helm-projectile): Add affixations when switching to buffer in ot…

    …her window or frame
    
    Both new commands uses the same `helm-source` class as
    `helm-projectile-switch-to-buffer` does. Although, the first (default) action
    is substituted to perform switching to a buffer in other window or frame.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    e7b2434 View commit details
  3. Copy the full SHA
    1cb134c View commit details
  4. Copy the full SHA
    88ae5a3 View commit details
  5. ci: Rename CI Tests workflow to include Exordium

    Workflow name is reflected in rendered workflow status web page title. When
    there are many open tabs in a browser, their names are truncated. When using
    specific words in the beginning of a name it is easier to fish out required
    tab.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    01ff2fe View commit details
  6. feat(forge)!: Show diff when creating a pull request

    When a Pull Request is created a new buffer with diff for the pull request is
    displayed alongside the Pull Request topic window.
    
    This has been inspired by magit/forge#683, but
    added automatic killing of diff buffer when PR is submitted/cancelled.
    
    BREAKING CHANGE: New key bindings for Exordium's `forge` extensions, to avoid
      clobbering existing bindings.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    a984c51 View commit details
  7. feat(forge): New command to insert messages from all commits in a PR …

    …post
    
    By default `forge` populates a new PR post with the following logic:
    1. If available, use URL from a repository template (switching to browser and
       cancelling the post),
    2. Otherwise, if available use YAML front matter from a repository template,
    3. Otherwise, if there's only a one commit in the PR, use the commit message.
    
    However, when there are multiple commits one needs to manually pull relevant
    details from their messages to the PR post.
    
    The new command `exordium-forge-insert-pullreq-commit-messages` will scan all
    the commits and insert their messages to the post.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    16f2858 View commit details
  8. Copy the full SHA
    ff9fd44 View commit details
  9. feat(git,treesit,company)!: Add support for Conventional Commits

    Add `git-commit-ts-mode` that uses Connventional Commits grammar for
    highlighting in git commits.
    
    Also add a small `company` backend to support (at least some of) Conventional
    Commits keywords (types and footers).
    
    For Conventional Commits specification see  https://www.conventionalcommits.org.
    
    BREAKING CHANGE: commit buffers now use `git-commit-ts-mode`
    pkryger committed Feb 27, 2025
    Copy the full SHA
    eff11fa View commit details
  10. feat(company,git,forge): Add teams to completions in git/forge

    Forge has added support for teams only
    [recently](magit/forge@7cdf978),
    so lets take leverage of it. Only team handles (in a form of
    `organisation/name`) are stored, hence no annotation with a team description in
    the completion popup.
    
    The backend suggest completion either when beginning of orgranisation matches
    or when beginning of the team name matches.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    f997a83 View commit details
  11. feat(company)!: Add company-posframe

    I think the biggest benefit is that it adds the small popup on the right with
    currently selected candidate's docsctring.
    
    BREAKING CHANGE: Use `company-posframe-quickhelp` by default instead of
      `company-doc-buffer`. That includes some key mappings to point to the former
      instead of the latter.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    8958e0d View commit details
  12. feat(company)!: Use C-o to switch backends

    This is the same binding `helm` uses to switch sources, so I guess backend
    switch is more anticipated thatn `casual` EdidKit popping up.
    
    BREAKING CHANGE: C-o now switches `company` backend when `company` popup is
      visible.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    dfd858b View commit details
  13. feat(company): Add topics to company backends

    The new backend kicks in when authoring a commit message, or a pull request
    message. It completes entries after a `#` sign.
    
    GitHub icons, sourced from https://github.com/primer/octicons/tree/ac9d1a7,
    distributed under MIT license.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    597c4ed View commit details
  14. feat(company): Add icons to company assagnees backend

    Leverage support created for `exordium-company-topics`.
    
    GitHub icons, sourced from https://github.com/primer/octicons/tree/ac9d1a7,
    distributed under MIT license.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    d9d0939 View commit details
  15. Copy the full SHA
    f5edbc5 View commit details
  16. feat(markdown): Enable native fontification for code blocks

    This is similar to what `org-src-fontify-natively` does.
    pkryger committed Feb 27, 2025
    Copy the full SHA
    388c05b View commit details
  17. [dev] Don't remove trailing whitespaces in diff as well as in data se…

    …ctions in perl and ruby
    pkryger committed Feb 27, 2025
    Copy the full SHA
    cc45986 View commit details
  18. Copy the full SHA
    f1b2c32 View commit details
  19. Copy the full SHA
    fbf6a7a View commit details
  20. Copy the full SHA
    655ebed View commit details
  21. Copy the full SHA
    da3b778 View commit details
14 changes: 8 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Tests
name: Exordium - CI Tests

on:
workflow_dispatch:
@@ -33,6 +33,7 @@ jobs:
- 29.2
- 29.3
- 29.4
- 30.1
- snapshot
steps:
- uses: purcell/setup-emacs@master
@@ -70,26 +71,26 @@ jobs:

- name: 'Checkout checkdoc-batch'
uses: actions/checkout@v4
if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
if: contains(fromJSON('["29.4", "30.1", "snapshot"]'), matrix.emacs_version)
with:
repository: 'pkryger/ckeckdoc-batch.el'
path: .emacs.d/checkdoc-batch

- name: 'Lint: checkdoc'
if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
if: contains(fromJSON('["29.4", "30.1", "snapshot"]'), matrix.emacs_version)
run: '"${HOME}/.emacs.d/.ci/batch-checkdoc.sh"'

- name: 'Lint: compilation' # Close to the end, to let other builds escape errors
# caused by compilation shenanigans
if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
if: contains(fromJSON('["29.4", "30.1", "snapshot"]'), matrix.emacs_version)
run: '"${HOME}/.emacs.d/.ci/batch-byte-compile.sh"'

- name: 'Lint: flycheck' # After compilation that should install all packages
if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
if: contains(fromJSON('["29.4", "30.1", "snapshot"]'), matrix.emacs_version)
run: '"${HOME}/.emacs.d/.ci/batch-flycheck.sh"'

- name: 'Lint: relint'
if: contains(fromJSON('["29.4", "snapshot"]'), matrix.emacs_version)
if: contains(fromJSON('["29.4", "30.1", "snapshot"]'), matrix.emacs_version)
run: '"${HOME}/.emacs.d/.ci/batch-relint.sh"'

pkryger-taps:
@@ -102,6 +103,7 @@ jobs:
- macos-latest
emacs_version:
- 29.4
- 30.1
- snapshot
steps:
- uses: purcell/setup-emacs@master
23 changes: 16 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -181,10 +181,17 @@ Keybinding | Description

Auto-complete/Company:

Keybinding | Description
-------------------|-----------------------------------------------------------
<kbd>C-.</kbd> | Force trigger auto-complete/company-complete.
<kbd>ESC</kbd> | Abort auto-complete/company-complete.
Keybinding | Description
------------------------------------|------------------------------------------------------------------------------------------
<kbd>C-.</kbd> | Force trigger auto-complete/company-complete.
<kbd>ESC</kbd> | Abort auto-complete/company-complete.
<kbd>C-o</kbd> or <kbd>C-\\</kbd> | Company only: switch to other backend (`company-other-backend`)
<kbd>C-M-h</kbd> | Company only: show doc buffer for current candidate (`company-show-doc-buffer`)
<kbd>C-M-v</kbd> | Company only: scroll doc buffer up (`scroll-other-window`)
<kbd>C-M-S-v</kbd> | Company only: scroll doc buffer down (`scroll-other-window-down`)
<kbd>C-h</kbd> or <kbd><f1></kbd> | Company only: show quick help for current candidate (`company-posframe-quickhelp-toggle`)
<kbd>C-S-v</kbd> or <kbd><f2></kbd> | Company only: scroll quick help up (`company-posframe-quickhelp-scroll-up`)
<kbd>M-V</kbd> or <kbd><f3></kbd> | Company only: scroll quick help down (`company-posframe-quickhelp-scroll-down`)

Tip: if you are looking for a particular key and you know it starts with a
given prefix, type the prefix followed by <kbd>C-h</kbd>: Emacs will display
@@ -452,9 +459,11 @@ Forge keys:

Keybinding | Description
----------------------|-----------------------------------------------------------
<kbd>C-c C-p</kbd> | in `forge-post-mode`: Preview post with markdown (`exordium-forge-markdown-preview`)
<kbd>C-c C-d</kbd> | in `forge-post-mode`: Submit current post (a Pull Request) as a draft (`exordium-forge-post-submit-draft`)
<kbd>C-c C-d</kbd> | in `magit-status-mode` and in `forge-topic-mode`: Mark a Pull Request at point as ready for review (`exordium-forge-mark-ready-for-rewiew`)
<kbd>C-c M-p</kbd> | in `forge-post-mode`: Preview post with markdown (`exordium-forge-markdown-preview`)
<kbd>C-c M-d</kbd> | in `forge-post-mode`: Show diff for pull request (`exordium-forge-diff-for-pullreq`)
<kbd>C-c M-r</kbd> | in `forge-post-mode`: Submit current post (a Pull Request) as a draft (`exordium-forge-post-submit-draft`)
<kbd>C-c M-c</kbd> | in `forge-post-mode`: Insert messages from all commits that are in this pull request (`exordium-forge-insert-pullreq-commit-messages`)
<kbd>C-c M-r</kbd> | in `magit-status-mode` and in `forge-topic-mode`: Mark a Pull Request at point as ready for review (`exordium-forge-mark-ready-for-rewiew`)


Git gutter keys:
21 changes: 21 additions & 0 deletions company-icons/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 GitHub Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions company-icons/git-merge-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/git-pull-request-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/git-pull-request-closed-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/git-pull-request-draft-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/issue-closed-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/issue-draft-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/issue-opened-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/people-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions company-icons/person-16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions doc/code-organization.md
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ The source code is in these directories:
* *extensions*: third party packages not present in melpa, included in source
code.
* *snippets*: snippet files for YASnippets.
* *company-icons*: icon files for Exordium provided Comany backends.

Note: *vendor* should be removed (code should move to *extensions*).

15 changes: 15 additions & 0 deletions init.el
Original file line number Diff line number Diff line change
@@ -241,6 +241,21 @@ melpa-stable.")
(exordium-require 'init-force-elpa)
(exordium-require 'init-vc-checkout)

;; Make sure summaries are generated for `package-vc-install' (and co.)
;; functions, see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76065
(defun exordium--package-vc-erase-summary (args)
"Set summary slot in (car ARGS) to nil."
(when-let* ((pkg-desc (car args))
((package-desc-p pkg-desc))
((equal package--default-summary (oref pkg-desc summary))))
(oset pkg-desc summary nil))
args)

(when (and (require 'package-vc nil t) ;; Since Emacs-29
(version< emacs-version "30.2")) ;; Until Emacs-30.2
(advice-add 'package-vc--generate-description-file
:filter-args #'exordium--package-vc-erase-summary))

;; Pin user extra packages early, in case they are dependencies of some other
;; packages that are installed early.
(dolist (pkg exordium-extra-pinned)
Loading