[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit ed8067830f 07/11: Remove variables and function
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit ed8067830f 07/11: Remove variables and functions obsolete since v3.3.0 |
Date: |
Mon, 13 Mar 2023 14:00:24 -0400 (EDT) |
branch: elpa/git-commit
commit ed8067830f87e221341ea17865477c2f05108c55
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Remove variables and functions obsolete since v3.3.0
---
lisp/magit-fetch.el | 11 +-------
lisp/magit-mode.el | 72 ++++----------------------------------------------
lisp/magit-obsolete.el | 24 -----------------
lisp/magit.el | 4 ---
4 files changed, 6 insertions(+), 105 deletions(-)
diff --git a/lisp/magit-fetch.el b/lisp/magit-fetch.el
index cdd8e32e5c..7b804311ac 100644
--- a/lisp/magit-fetch.el
+++ b/lisp/magit-fetch.el
@@ -28,12 +28,6 @@
(require 'magit)
-(defvar magit-fetch-modules-jobs nil)
-(make-obsolete-variable
- 'magit-fetch-modules-jobs
- "invoke `magit-fetch-modules' with a prefix argument instead."
- "Magit 3.0.0")
-
;;; Commands
;;;###autoload (autoload 'magit-fetch "magit-fetch" nil t)
@@ -172,10 +166,7 @@ are also fetched.
To set and potentially save other arguments invoke this command
with a prefix argument."
:man-page "git-fetch"
- :value (list "--verbose"
- (cond (magit-fetch-modules-jobs
- (format "--jobs=%s" magit-fetch-modules-jobs))
- (t "--jobs=4")))
+ :value (list "--verbose" "--jobs=4")
["Arguments"
("-v" "verbose" "--verbose")
("-j" "number of jobs" "--jobs=" :reader transient-read-number-N+)]
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 72fc7d2b80..d09337fe6f 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -561,21 +561,11 @@ Magit is documented in info node `(magit)'."
;; function does not reinstate this.
(put 'magit-buffer-diff-files-suspended 'permanent-local t)
-(defvar-local magit-refresh-args nil
- "Obsolete. Possibly the arguments used to refresh the current buffer.
-Some third-party packages might still use this, but Magit does not.")
-(put 'magit-refresh-args 'permanent-local t)
-(make-obsolete-variable 'magit-refresh-args nil "Magit 3.0.0")
-
-(defvar magit-buffer-lock-functions nil
- "Obsolete buffer-locking support for third-party modes.
-Implement the generic function `magit-buffer-value' for
-your mode instead of adding an entry to this variable.")
-(make-obsolete-variable 'magit-buffer-lock-functions nil "Magit 3.0.0")
-
(cl-defgeneric magit-buffer-value ()
- (and-let* ((fn (cdr (assq major-mode magit-buffer-lock-functions))))
- (funcall fn (with-no-warnings magit-refresh-args))))
+ "Return the value of the current buffer.
+The \"value\" identifies what is being displayed in the buffer.
+The buffer's major-mode should derive from `magit-section-mode'."
+ nil)
(defvar-local magit-previous-section nil)
(put 'magit-previous-section 'permanent-local t)
@@ -619,41 +609,6 @@ your mode instead of adding an entry to this variable.")
(magit-refresh-buffer))
buffer))
-(defun magit-mode-setup (mode &rest args)
- "Setup up a MODE buffer using ARGS to generate its content."
- (declare (obsolete magit-setup-buffer "Magit 3.0.0"))
- (with-no-warnings
- (magit-mode-setup-internal mode args)))
-
-(defun magit-mode-setup-internal (mode args &optional locked)
- "Setup up a MODE buffer using ARGS to generate its content.
-When optional LOCKED is non-nil, then create a buffer that is
-locked to its value, which is derived from MODE and ARGS."
- (declare (obsolete magit-setup-buffer "Magit 3.0.0"))
- (let* ((value (and locked
- (with-temp-buffer
- (with-no-warnings
- (setq magit-refresh-args args))
- (let ((major-mode mode))
- (magit-buffer-value)))))
- (buffer (magit-get-mode-buffer mode value))
- (section (and buffer (magit-current-section)))
- (created (not buffer)))
- (unless buffer
- (setq buffer (magit-generate-new-buffer mode value)))
- (with-current-buffer buffer
- (setq magit-previous-section section)
- (with-no-warnings
- (setq magit-refresh-args args))
- (funcall mode)
- (magit-xref-setup 'magit-mode-setup-internal args)
- (when created
- (run-hooks 'magit-create-buffer-hook)))
- (magit-display-buffer buffer)
- (with-current-buffer buffer
- (run-hooks 'magit-mode-setup-hook)
- (magit-refresh-buffer))))
-
;;; Display Buffer
(defvar magit-display-buffer-noselect nil
@@ -868,23 +823,6 @@ If a frame, then only consider buffers on that frame."
((or 'selected 't) (seq-some #'w (window-list (selected-frame))))
((guard (framep frame)) (seq-some #'w (window-list frame)))))))
-(defun magit-mode-get-buffer (mode &optional create frame value)
- (declare (obsolete magit-get-mode-buffer "Magit 3.0.0"))
- (when create
- (error "`magit-mode-get-buffer's CREATE argument is obsolete"))
- (let ((topdir (magit--toplevel-safe)))
- (--first (with-current-buffer it
- (and (eq major-mode mode)
- (equal magit--default-directory topdir)
- (if value
- (and magit-buffer-locked-p
- (equal (magit-buffer-value) value))
- (not magit-buffer-locked-p))))
- (if frame
- (mapcar #'window-buffer
- (window-list (unless (eq frame t) frame)))
- (buffer-list)))))
-
(defun magit-generate-new-buffer (mode &optional value directory)
(let* ((default-directory (or directory (magit--toplevel-safe)))
(name (funcall magit-generate-buffer-name-function mode value))
@@ -1091,7 +1029,7 @@ Run hooks `magit-pre-refresh-hook' and
`magit-post-refresh-hook'."
(let ((inhibit-read-only t))
(erase-buffer)
(save-excursion
- (apply refresh (with-no-warnings magit-refresh-args))))
+ (funcall refresh)))
(pcase-dolist (`(,window . ,args) windows)
(if (eq buffer (window-buffer window))
(with-selected-window window
diff --git a/lisp/magit-obsolete.el b/lisp/magit-obsolete.el
index 8a74a34c6f..36dfc7eed9 100644
--- a/lisp/magit-obsolete.el
+++ b/lisp/magit-obsolete.el
@@ -30,30 +30,6 @@
;;; Obsolete since v3.0.0
-(define-obsolete-function-alias 'magit-diff-visit-file-worktree
- #'magit-diff-visit-worktree-file "Magit 3.0.0")
-
-(define-obsolete-function-alias 'magit-status-internal
- #'magit-status-setup-buffer "Magit 3.0.0")
-
-(define-obsolete-variable-alias 'magit-mode-setup-hook
- 'magit-setup-buffer-hook "Magit 3.0.0")
-
-(define-obsolete-variable-alias 'magit-branch-popup-show-variables
- 'magit-branch-direct-configure "Magit 3.0.0")
-
-(define-obsolete-function-alias 'magit-dispatch-popup
- #'magit-dispatch "Magit 3.0.0")
-
-(define-obsolete-function-alias 'magit-repolist-column-dirty
- #'magit-repolist-column-flag "Magit 3.0.0")
-
-(define-obsolete-variable-alias 'magit-disable-line-numbers
- 'magit-section-disable-line-numbers "Magit 3.0.0")
-
-(define-obsolete-variable-alias 'inhibit-magit-refresh
- 'magit-inhibit-refresh "Magit 3.0.0")
-
(defun magit--magit-popup-warning ()
(display-warning 'magit "\
Magit no longer uses Magit-Popup.
diff --git a/lisp/magit.el b/lisp/magit.el
index e352c4c20a..772c11db51 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -248,10 +248,6 @@ and/or `magit-branch-remote-head'."
;;; Global Bindings
-;;;###autoload
-(define-obsolete-variable-alias 'global-magit-file-mode
- 'magit-define-global-key-bindings "Magit 3.0.0")
-
;;;###autoload
(defcustom magit-define-global-key-bindings t
"Whether to bind some Magit commands in the global keymap.
- [nongnu] elpa/git-commit updated (dec25b407b -> 9b6ae49dd1), ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 2bc6aaf527 02/11: Avoid using called-interactively-p, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 6b4f7f5811 05/11: Remove magit-section-when, obsolete since v2.90.0, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit df2f6e3f5d 01/11: magit-xref-setup: Limit number of items, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 5b31ec985f 03/11: Cleanup whitespace, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit a8c92cc35d 06/11: Remove face aliases, obsolete since v2.12.0 and v3.0.0, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit ed8067830f 07/11: Remove variables and functions obsolete since v3.3.0,
ELPA Syncer <=
- [nongnu] elpa/git-commit 02f4d3366e 08/11: Remove kludge for unmaintained third-party packages, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 9b6ae49dd1 11/11: test: Compile magit-tests.el, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 9e888be5ac 09/11: Remove magit-obsolete.el, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit 26a705fffe 10/11: test: Stop using removed magit-status-internal alias, ELPA Syncer, 2023/03/13
- [nongnu] elpa/git-commit bc18ba942f 04/11: Remove git-commit-fill-column, obsolete since v2.11.0, ELPA Syncer, 2023/03/13