|
1 | 1 | ;;; diff-hl-show-hunk-inline.el --- inline popup using phantom overlays -*- lexical-binding: t -*- |
2 | 2 |
|
3 | | -;; Copyright (C) 2020-2021 Free Software Foundation, Inc. |
| 3 | +;; Copyright (C) 2020-2025 Free Software Foundation, Inc. |
4 | 4 |
|
5 | 5 | ;; Author: Álvaro González <alvarogonzalezsotillo@gmail.com> |
6 | 6 |
|
|
25 | 25 | ;;; Code: |
26 | 26 |
|
27 | 27 | (require 'subr-x) |
| 28 | +(require 'diff-hl-show-hunk) |
| 29 | + |
| 30 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--current-lines 'diff-hl-show-hunk-inline--current-lines "0.11.0") |
| 31 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--current-index 'diff-hl-show-hunk-inline--current-index "0.11.0") |
| 32 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--invoking-command 'diff-hl-show-hunk-inline--invoking-command "0.11.0") |
| 33 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--current-footer 'diff-hl-show-hunk-inline--current-footer "0.11.0") |
| 34 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--current-header 'diff-hl-show-hunk-inline--current-header "0.11.0") |
| 35 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--height 'diff-hl-show-hunk-inline--height "0.11.0") |
| 36 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--current-custom-keymap 'diff-hl-show-hunk-inline--current-custom-keymap "0.11.0") |
| 37 | +(define-obsolete-variable-alias 'diff-hl-inline-popup--close-hook 'diff-hl-show-hunk-inline--close-hook "0.11.0") |
| 38 | +(define-obsolete-variable-alias 'diff-hl-show-hunk-inline-popup-hide-hunk 'diff-hl-show-hunk-inline-hide-hunk "0.11.0") |
| 39 | +(define-obsolete-variable-alias 'diff-hl-show-hunk-inline-popup-smart-lines 'diff-hl-show-hunk-inline-smart-lines "0.11.0") |
| 40 | +(define-obsolete-variable-alias 'diff-hl-inline-popup-transient-mode-map 'diff-hl-show-hunk-inline-transient-mode-map "0.11.0") |
28 | 41 |
|
29 | 42 | (defvar diff-hl-show-hunk-inline--current-popup nil "The overlay of the current inline popup.") |
30 | 43 | (defvar diff-hl-show-hunk-inline--current-lines nil "A list of the lines to show in the popup.") |
|
46 | 59 | (make-variable-buffer-local 'diff-hl-show-hunk-inline--height) |
47 | 60 | (make-variable-buffer-local 'diff-hl-show-hunk-inline--close-hook) |
48 | 61 |
|
| 62 | +(defgroup diff-hl-show-hunk-inline nil |
| 63 | + "Show vc diffs inline inside a buffer." |
| 64 | + :group 'diff-hl-show-hunk) |
| 65 | + |
49 | 66 | (defcustom diff-hl-show-hunk-inline-hide-hunk nil |
50 | 67 | "If t, inline-popup is shown over the hunk, hiding it." |
51 | 68 | :type 'boolean) |
@@ -359,19 +376,6 @@ BUFFER is a buffer with the hunk." |
359 | 376 | height)) |
360 | 377 | ))) |
361 | 378 |
|
362 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-popup 'diff-hl-show-hunk-inline--current-popup "0.11.0") |
363 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-lines 'diff-hl-show-hunk-inline--current-lines "0.11.0") |
364 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-index 'diff-hl-show-hunk-inline--current-index "0.11.0") |
365 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--invoking-command 'diff-hl-show-hunk-inline--invoking-command "0.11.0") |
366 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-footer 'diff-hl-show-hunk-inline--current-footer "0.11.0") |
367 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-header 'diff-hl-show-hunk-inline--current-header "0.11.0") |
368 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--height 'diff-hl-show-hunk-inline--height "0.11.0") |
369 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--current-custom-keymap 'diff-hl-show-hunk-inline--current-custom-keymap "0.11.0") |
370 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup--close-hook 'diff-hl-show-hunk-inline--close-hook "0.11.0") |
371 | | -(define-obsolete-variable-alias 'diff-hl-show-hunk-inline-popup-hide-hunk 'diff-hl-show-hunk-inline-hide-hunk "0.11.0") |
372 | | -(define-obsolete-variable-alias 'diff-hl-show-hunk-inline-popup-smart-lines 'diff-hl-show-hunk-inline-smart-lines "0.11.0") |
373 | | -(define-obsolete-variable-alias 'diff-hl-inline-popup-transient-mode-map 'diff-hl-show-hunk-inline-transient-mode-map "0.11.0") |
374 | | - |
375 | 379 | (define-obsolete-function-alias 'diff-hl-inline-popup--splice 'diff-hl-show-hunk-inline--splice "0.11.0") |
376 | 380 | (define-obsolete-function-alias 'diff-hl-inline-popup--ensure-enough-lines 'diff-hl-show-hunk-inline--ensure-enough-lines "0.11.0") |
377 | 381 | (define-obsolete-function-alias 'diff-hl-inline-popup--compute-content-height 'diff-hl-show-hunk-inline--compute-content-height "0.11.0") |
|
0 commit comments