branch: elpa/magit
commit 816fc35c96a0526d3028b0af26da913700c32e7b
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Move definition of obsolete variable aliases
---
lisp/magit-diff.el | 6 +++---
lisp/magit-section.el | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index b051303af7e..10f69da2e6d 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -90,6 +90,9 @@
(cl-pushnew 'action-type eieio--known-slot-names)
(cl-pushnew 'target eieio--known-slot-names))
+(define-obsolete-variable-alias 'magit-diff-section-base-map
+ 'magit-diff-section-map "Magit-Section 4.0.0")
+
;;; Options
;;;; Diff Mode
@@ -2050,9 +2053,6 @@ Staging and applying changes is documented in info node
(cl-defmethod magit-menu-common-value ((_section magit-diff-section))
(magit-diff-scope))
-(define-obsolete-variable-alias 'magit-diff-section-base-map
- 'magit-diff-section-map "Magit-Section 4.0.0")
-
(defvar-keymap magit-diff-section-map
:doc "Keymap for diff sections.
The classes `magit-file-section' and `magit-hunk-section' derive
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 08dd0875ce8..fef1c133364 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -99,6 +99,9 @@ similar defect.")
;; For `magit-section-get-relative-position'
(declare-function magit-hunk-section-p "magit-diff" (section) t)
+(define-obsolete-variable-alias 'magit-keep-region-overlay
+ 'magit-section-keep-region-overlay "Magit-Section 4.0.0")
+
;;; Hooks
(defvar magit-section-movement-hook nil
@@ -234,9 +237,6 @@ Otherwise the value has to have one of these two forms:
(const :tag "Yes (potentially slow)" t)
(const :tag "No (kinda ugly)" nil)))))
-(define-obsolete-variable-alias 'magit-keep-region-overlay
- 'magit-section-keep-region-overlay "Magit-Section 4.0.0")
-
(defcustom magit-section-keep-region-overlay nil
"Whether to keep the region overlay when there is a valid selection.
