Skip to content

Commit 8dc486f

Browse files
committed
Fix b-c warnings
Reported by @tarsius
1 parent 05b92b4 commit 8dc486f

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

diff-hl-show-hunk-inline.el

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; diff-hl-show-hunk-inline.el --- inline popup using phantom overlays -*- lexical-binding: t -*-
22

3-
;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
3+
;; Copyright (C) 2020-2025 Free Software Foundation, Inc.
44

55
;; Author: Álvaro González <alvarogonzalezsotillo@gmail.com>
66

@@ -25,6 +25,19 @@
2525
;;; Code:
2626

2727
(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")
2841

2942
(defvar diff-hl-show-hunk-inline--current-popup nil "The overlay of the current inline popup.")
3043
(defvar diff-hl-show-hunk-inline--current-lines nil "A list of the lines to show in the popup.")
@@ -46,6 +59,10 @@
4659
(make-variable-buffer-local 'diff-hl-show-hunk-inline--height)
4760
(make-variable-buffer-local 'diff-hl-show-hunk-inline--close-hook)
4861

62+
(defgroup diff-hl-show-hunk-inline nil
63+
"Show vc diffs inline inside a buffer."
64+
:group 'diff-hl-show-hunk)
65+
4966
(defcustom diff-hl-show-hunk-inline-hide-hunk nil
5067
"If t, inline-popup is shown over the hunk, hiding it."
5168
:type 'boolean)
@@ -359,19 +376,6 @@ BUFFER is a buffer with the hunk."
359376
height))
360377
)))
361378

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-
375379
(define-obsolete-function-alias 'diff-hl-inline-popup--splice 'diff-hl-show-hunk-inline--splice "0.11.0")
376380
(define-obsolete-function-alias 'diff-hl-inline-popup--ensure-enough-lines 'diff-hl-show-hunk-inline--ensure-enough-lines "0.11.0")
377381
(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

Comments
 (0)