From f6b4d03118be162370d4bf3a6765be475b5e393c Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Sun, 30 Aug 2026 22:40:26 -0400 Subject: add local --- 2026/info/local-after.md | 10 ++++++++++ 2026/info/local-before.md | 12 ++++++++++++ 2026/info/local-nav.md | 4 ++++ 2026/organizers-notebook/index.org | 1 + 2026/organizers-notebook/schedule.svg | 2 +- 2026/talks/local.md | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 2026/info/local-after.md create mode 100644 2026/info/local-before.md create mode 100644 2026/info/local-nav.md create mode 100644 2026/talks/local.md diff --git a/2026/info/local-after.md b/2026/info/local-after.md new file mode 100644 index 00000000..e912d2a5 --- /dev/null +++ b/2026/info/local-after.md @@ -0,0 +1,10 @@ + + + +Questions or comments? Please e-mail [wouter@brainbaking.com](mailto:wouter@brainbaking.com?subject=Comment%20for%20EmacsConf%202023%20local%3A%20Local%20File%20History%20Possibilities%20in%20Emacs) + +---- +Got an idea for an EmacsConf talk or session? We'd love to hear from you! Check out the [[Call for Participation|/2026/cfp]] for details. + + + diff --git a/2026/info/local-before.md b/2026/info/local-before.md new file mode 100644 index 00000000..dc41f932 --- /dev/null +++ b/2026/info/local-before.md @@ -0,0 +1,12 @@ + +[[!toc ]] +Format: 10-min talk +Status: TO_REVIEW + + + + + + +# Description + \ No newline at end of file diff --git a/2026/info/local-nav.md b/2026/info/local-nav.md new file mode 100644 index 00000000..35ed938a --- /dev/null +++ b/2026/info/local-nav.md @@ -0,0 +1,4 @@ + +
+Back to the [[talks]] +
\ No newline at end of file diff --git a/2026/organizers-notebook/index.org b/2026/organizers-notebook/index.org index 8b8e1d4a..7487af1d 100644 --- a/2026/organizers-notebook/index.org +++ b/2026/organizers-notebook/index.org @@ -228,6 +228,7 @@ CLOSED: [2026-07-02 Thu 11:35] emacspeak align cadet + local open-mic (lunch :start "12:00") sat-close diff --git a/2026/organizers-notebook/schedule.svg b/2026/organizers-notebook/schedule.svg index f2381868..0c082bce 100644 --- a/2026/organizers-notebook/schedule.svg +++ b/2026/organizers-notebook/schedule.svg @@ -1 +1 @@ -Graphical view of the scheduleSchedule for SaturdaySaturday 9:00- 9:10 Saturday opening remarkssat-open 9:10- 9:40 Multi-dimensional information processing with Emacs and Emacspeak: a blind man's perspectiveemacspeak 9:50-10:10 Column-aligning text in Emacsalign10:30-10:40 My Space Cadet Deck - an Android Stream Deck replacement with deep Emacs integrationcadet 1:00- 1:10 Saturday closing remarks / open sessionsat-close9 AM10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PMSchedule for SundaySunday 9:00- 9:10 Sunday opening remarkssun-open 1:00- 1:10 Sunday closing remarkssun-close9 AM10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PMSchedule for SundaySunday 5:36- 5:36 Open sessionopen-mic10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PM6 PM \ No newline at end of file +Graphical view of the scheduleSchedule for SaturdaySaturday 9:00- 9:10 Saturday opening remarkssat-open 9:10- 9:40 Multi-dimensional information processing with Emacs and Emacspeak: a blind man's perspectiveemacspeak 9:50-10:10 Column-aligning text in Emacsalign10:30-10:40 My Space Cadet Deck - an Android Stream Deck replacement with deep Emacs integrationcadet11:00-11:10 Local File History Possibilities in Emacslocal 1:00- 1:10 Saturday closing remarks / open sessionsat-close9 AM10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PMSchedule for SundaySunday 9:00- 9:10 Sunday opening remarkssun-open 1:00- 1:10 Sunday closing remarkssun-close9 AM10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PMSchedule for SundaySunday10:39-10:39 Open sessionopen-mic10 AM11 AM12 PM1 PM2 PM3 PM4 PM5 PM6 PM \ No newline at end of file diff --git a/2026/talks/local.md b/2026/talks/local.md new file mode 100644 index 00000000..158775d8 --- /dev/null +++ b/2026/talks/local.md @@ -0,0 +1,33 @@ +[[!meta title="Local File History Possibilities in Emacs"]] +[[!meta copyright="Copyright © 2026 Wouter Groeneveld"]] +[[!inline pages="internal(2026/info/local-nav)" raw="yes"]] + + + + + +# Local File History Possibilities in Emacs +Wouter Groeneveld - , + +[[!inline pages="internal(2026/info/local-before)" raw="yes"]] + +Emacs offers a myriad of ways to keep track of previous versions +of your document: through tilde-like backup files, auto-save +files, and of course the extensive built-in undo history +system. Navigating that can be a chore unless you install +something like vundo to visualize the undo tree. But with a huge +undo-limit, even vundo can become unwieldy. What if we can conjure +up a way to diff between the current document and the state it was +in ten or twenty minutes ago, not unlike IntelliJ's local history +system? Using a combination of Consult (preview) and diff-buff, +that can be easily done! In this lightning talk, we'll explore how +to quickly browse through diff history and roll back using +built-in Emacs tooling. + + + +[[!inline pages="internal(2026/info/local-after)" raw="yes"]] + +[[!inline pages="internal(2026/info/local-nav)" raw="yes"]] + + -- cgit v1.2.3