diff --git a/etc/NEWS.28 b/etc/NEWS.28 index d415a242fcb..8e38c3690c1 100644 --- a/etc/NEWS.28 +++ b/etc/NEWS.28 @@ -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. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 3f89fad2351..2d35061b269 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -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)