master updated (1424342225 -> e871f21348)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  1424342225 vc-git-checkin: Don't try to apply an empty patch
      adds  b3e7768a0e Repair setopt test after error demotion to warning
      adds  a75d1da911 Make emacsclient add abbreviated file names to 
file-name-history
      adds  64163618d2 whitespace: Fix unintended change in buffer modification 
status
      adds  63cdbd986b ; Really respect browse-url var in erc-compat
      adds  23f7c9c2a9 Fix storing email into nnmail by Gnus
      adds  399433cc2b * lisp/progmodes/project.el: Filter out empty strings 
from history (bug#58447)
      adds  b9e813f79f ; ruby-indent-level: Improve the docstring
      adds  2b1fdbffcb ruby-method-params-indent: New user option
      adds  cfbfd393b4 * lisp/progmodes/project.el 
(project--read-file-cpd-relative): Optimize.
      adds  fb7f3999c5 ; Fix ruby-method-params-indent's :version value
      adds  8550a99378 ; * src/emacs-module.h.in (enum emacs_funcall_exit): Fix 
typo.
      adds  d03ea89378 eglot.el: Add vscode-json-languageserver to 
eglot-server-programs
      adds  8ef3777d54 Correct capitalization of Lisp in the manual (bug#60222)
      adds  d3a76db88b * lisp/repeat.el: Fix repeat-keep-prefix to allow 
customizing it to non-nil.
       new  2bbc554db6 Merge from origin/emacs-29
       new  e871f21348 ; Manually fix merge errors in etc/NEWS


Summary of changes:
 doc/lispref/compile.texi                           |   2 +-
 etc/NEWS.29                                        |   3 +
 lisp/erc/erc-compat.el                             |  10 +-
 lisp/erc/erc.el                                    |  12 +--
 lisp/gnus/nnml.el                                  |  13 ++-
 lisp/progmodes/eglot.el                            |   1 +
 lisp/progmodes/project.el                          |   4 +-
 lisp/progmodes/ruby-mode.el                        |  28 ++++-
 lisp/repeat.el                                     | 117 +++++++++++++--------
 lisp/server.el                                     |   2 +-
 lisp/whitespace.el                                 |  28 ++---
 src/emacs-module.h.in                              |   2 +-
 test/lisp/cus-edit-tests.el                        |  11 +-
 .../ruby-method-params-indent.rb                   |  18 ++++
 test/lisp/progmodes/ruby-mode-resources/ruby.rb    |   4 +
 test/lisp/progmodes/ruby-mode-tests.el             |  24 +++--
 test/lisp/repeat-tests.el                          |  30 +++---
 test/lisp/whitespace-tests.el                      |  10 ++
 18 files changed, 214 insertions(+), 105 deletions(-)
 create mode 100644 
test/lisp/progmodes/ruby-mode-resources/ruby-method-params-indent.rb