procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
2963de6540 * lisp/vc/vc-git.el (vc-git-mergebase): More meaningful er...
a9148cdee5 ; Fix heading in etc/NEWS
9623342216 ; * etc/NEWS: Move a bookmark related item further down.

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2021-11-11 07:17:56 +01:00
commit 3e23494394
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
etc/NEWS.28
View file

@ -1399,7 +1399,6 @@ keys, add the following to your init file:
Using it instead of 'read-char-choice' allows using 'C-x o'
to switch to the help window displayed after typing 'C-h'.
+++
** Emacs 28.1 comes with Org v9.5.
See the file ORG-NEWS for user-visible changes in Org.
@ -1532,16 +1531,6 @@ used instead.
When the bookmark.el library is loaded, a customize choice is added
to 'tab-bar-new-tab-choice' for new tabs to show the bookmark list.
---
*** The 'list-bookmarks' menu is now based on 'tabulated-list-mode'.
The interactive bookmark list will now benefit from features in
'tabulated-list-mode' like sorting columns or changing column width.
Support for the optional "inline" header line, allowing for a header
without using 'header-line-format', has been dropped. Consequently,
the variables 'bookmark-bmenu-use-header-line' and
'bookmark-bmenu-inline-header-height' are now declared obsolete.
---
*** New user option 'bookmark-set-fringe-mark'.
If non-nil, setting a bookmark will set a fringe mark on the current
@ -1555,6 +1544,16 @@ that have been marked for deletion. However, if this new option is
non-nil then Emacs will require confirmation with 'yes-or-no-p' before
deleting.
---
*** The 'list-bookmarks' menu is now based on 'tabulated-list-mode'.
The interactive bookmark list will now benefit from features in
'tabulated-list-mode' like sorting columns or changing column width.
Support for the optional "inline" header line, allowing for a
header without using 'header-line-format', has been dropped.
The variables 'bookmark-bmenu-use-header-line' and
'bookmark-bmenu-inline-header-height' are now obsolete.
** Recentf
---
@ -1855,7 +1854,7 @@ The command 'next-error-no-select' is now bound to 'n' and
'previous-error-no-select' is bound to 'p'.
---
*** The new command 'recenter-current-error'.
*** New command 'recenter-current-error'.
It is bound to 'l' in Occur or compilation buffers, and recenters the
current displayed occurrence/error.

5
lisp/vc/vc-git.el
View file

@ -1256,7 +1256,10 @@ log entries."
(defun vc-git-mergebase (rev1 &optional rev2)
(unless rev2 (setq rev2 "HEAD"))
(string-trim-right (vc-git--run-command-string nil "merge-base" rev1 rev2)))
(let ((base (vc-git--run-command-string nil "merge-base" rev1 rev2)))
(if base
(string-trim-right base)
(error "No common ancestor for merge base"))))
(defvar log-view-message-re)
(defvar log-view-file-re)