diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-21 02:38:13 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-21 02:38:13 +0100 |
| commit | e871f21348a737541b181445c911dd58c34e9a47 (patch) | |
| tree | b939ef7861c08cc92cf1cd7da553f083d37267c7 /etc | |
| parent | 2bbc554db63cc5cc140ade5bfcbbf53ecd18f5ae (diff) | |
| download | emacs-e871f21348a737541b181445c911dd58c34e9a47.tar.gz | |
; Manually fix merge errors in etc/NEWS
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | etc/NEWS.29 | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -71,9 +71,6 @@ switches for shortlogs, such as the one produced by 'C-x v L'. You can now configure how to display the "*buffer-selection*" buffer using this new option. (Or set 'display-buffer-alist' directly.) ---- -*** New user option 'ruby-method-params-indent'. - ** Eshell +++ diff --git a/etc/NEWS.29 b/etc/NEWS.29 index 017fd850b4e..0e844596347 100644 --- a/etc/NEWS.29 +++ b/etc/NEWS.29 @@ -2761,6 +2761,9 @@ project-dedicated or global) is specified by the new --- *** Support for endless methods. +--- +*** New user option 'ruby-method-params-indent'. + ** Eshell +++ |