update packages
This commit is contained in:
@@ -89,7 +89,7 @@
|
||||
(declare-function magit-smerge-keep-base "magit-apply" ())
|
||||
(declare-function magit-smerge-keep-lower "magit-apply" ())
|
||||
|
||||
(eval-and-compile
|
||||
(eval-and-compile ;declare slot names
|
||||
(cl-pushnew 'orig-rev eieio--known-slot-names)
|
||||
(cl-pushnew 'action-type eieio--known-slot-names)
|
||||
(cl-pushnew 'target eieio--known-slot-names))
|
||||
@@ -1794,19 +1794,19 @@ the Magit-Status buffer for DIRECTORY."
|
||||
(list new-rev new-file))))
|
||||
|
||||
(defun magit-diff-visit--position (buffer rev file goto-from goto-file)
|
||||
(and-let ((hunk (magit-diff--hunk-section)))
|
||||
(let ((line (magit-diff-hunk-line hunk goto-from))
|
||||
(column (magit-diff-hunk-column hunk goto-from)))
|
||||
(with-current-buffer buffer
|
||||
(when (and goto-file (not (equal rev "{worktree}")))
|
||||
(setq line (magit-diff-visit--offset
|
||||
file (if (equal rev "{index}") nil rev) line)))
|
||||
(save-restriction
|
||||
(widen)
|
||||
(goto-char (point-min))
|
||||
(forward-line (1- line))
|
||||
(move-to-column column)
|
||||
(point))))))
|
||||
(and-let* ((hunk (magit-diff--hunk-section))
|
||||
(line (magit-diff-hunk-line hunk goto-from))
|
||||
(column (magit-diff-hunk-column hunk goto-from)))
|
||||
(with-current-buffer buffer
|
||||
(when (and goto-file (not (equal rev "{worktree}")))
|
||||
(setq line (magit-diff-visit--offset
|
||||
file (if (equal rev "{index}") nil rev) line)))
|
||||
(save-restriction
|
||||
(widen)
|
||||
(goto-char (point-min))
|
||||
(forward-line (1- line))
|
||||
(move-to-column column)
|
||||
(point)))))
|
||||
|
||||
(defun magit-diff-hunk-line (section goto-from)
|
||||
(save-excursion
|
||||
|
||||
Reference in New Issue
Block a user