Skip to content

Commit

Permalink
Prevent malformed cider-repl-history-files from failing `cider-cide…
Browse files Browse the repository at this point in the history
…r-jack-in` (#3429)

Fixes #2436
  • Loading branch information
vemv authored Aug 25, 2023
1 parent 3952734 commit 3d0c841
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
- Recompute namespace info on each fighweel-main recompilation.
- [#3250](https://github.com/clojure-emacs/cider/issues/3250): don't lose the CIDER session over TRAMP files.
- [#3413](https://github.com/clojure-emacs/cider/issues/3413): Make jump-to-definition work in projects needing `cider-path-translations` (i.e. Dockerized projects).
- [#2436](https://github.com/clojure-emacs/cider/issues/2436): Prevent malformed `cider-repl-history-file`s from failing `cider-jack-in`.
- Fix the `xref-find-definitions` CIDER backend to return correct filenames.
- Fix the `cider-xref-fn-deps` buttons to direct to the right file.
- Make TRAMP functionality work when using non-standard ports.
Expand Down
5 changes: 4 additions & 1 deletion cider-repl.el
Original file line number Diff line number Diff line change
Expand Up @@ -2018,7 +2018,10 @@ in an unexpected place."
;; apply dir-local variables to REPL buffers
(hack-dir-local-variables-non-file-buffer)
(when cider-repl-history-file
(cider-repl-history-load cider-repl-history-file)
(condition-case nil
(cider-repl-history-load cider-repl-history-file)
(error
(message "Malformed cider-repl-history-file: %s" cider-repl-history-file)))
(add-hook 'kill-buffer-hook #'cider-repl-history-just-save t t)
(add-hook 'kill-emacs-hook #'cider-repl-history-just-save))
(add-hook 'completion-at-point-functions #'cider-complete-at-point nil t)
Expand Down

0 comments on commit 3d0c841

Please sign in to comment.