aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2024-08-30 20:33:11 +0300
committerEli Zaretskii2024-08-30 20:33:11 +0300
commit62dcbfb776f7dce2da3de3d5cd31da7360316ded (patch)
tree7c6927bfcee02ebe53ef574e01fd7ad210810208 /lisp
parentdfcfaa0ef58bab0df243ebf816293a124f4c91c9 (diff)
parent1baa62b2ac12ac4dcdace079fabd4c21d10e3e6e (diff)
downloademacs-62dcbfb776f7dce2da3de3d5cd31da7360316ded.tar.gz
emacs-62dcbfb776f7dce2da3de3d5cd31da7360316ded.zip
Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30
Diffstat (limited to 'lisp')
-rw-r--r--lisp/tab-bar.el2
-rw-r--r--lisp/vc/vc-git.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 60d5bbf169b..363c98d8337 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1478,7 +1478,7 @@ in the same window to give information about the killed buffer."
1478 1478
1479(defun tab-bar-select-restore-windows (_frame windows _type) 1479(defun tab-bar-select-restore-windows (_frame windows _type)
1480 "Display a placeholder buffer in the window whose buffer was killed. 1480 "Display a placeholder buffer in the window whose buffer was killed.
1481A button in the window allows to restore the killed buffer, 1481A button in the window allows restoring the killed buffer,
1482if it was visiting a file." 1482if it was visiting a file."
1483 (dolist (quad windows) 1483 (dolist (quad windows)
1484 (when (window-live-p (nth 0 quad)) 1484 (when (window-live-p (nth 0 quad))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e8257c5dbd0..4006623799b 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1453,7 +1453,7 @@ way may omit certain (merge) commits, and that `log-view-diff'
1453fails on commits that used the previous name, in that log buffer. 1453fails on commits that used the previous name, in that log buffer.
1454 1454
1455When this variable is nil, and the log ends with a rename, we 1455When this variable is nil, and the log ends with a rename, we
1456show a button below that which allows to show the log for the 1456show a button below that which allows showing the log for the
1457file name before the rename." 1457file name before the rename."
1458 :type 'boolean 1458 :type 'boolean
1459 :version "26.1") 1459 :version "26.1")