GitLab

First line of the doc string should be a complete sentence.

* etc/NEWS: Mention new option.

# Fix associated ChangeLog entries.

* lisp/progmodes/js.el (js--proper-indentation): Add new custom option
`js-indent-first-initialiser' and a function to utilize it,
`js--maybe-goto-declaration-keyword-end'.

* test/indent/js.js: Add local variables.

* test/indent/js-indent-first-initialiser-t.js: New test for
`js-indent-first-initialiser'.

* test/indent/js-indent-first-initialiser-dynamic.js: New test for
`js-indent-first-initialiser'.

(cl-lib-test-plusp, cl-lib-test-minusp)
(cl-lib-test-oddp, cl-lib-test-evenp, cl-lib-test-first)
(cl-lib-test-second, cl-lib-test-third, cl-lib-test-fourth)
(cl-lib-test-fifth, cl-lib-test-sixth, cl-lib-test-seventh)
(cl-lib-test-eighth, cl-lib-test-ninth, cl-lib-test-tenth)
(cl-lib-test-endp, cl-lib-test-nth-value)
(cl-lib-nth-value-test-multiple-values, cl-test-caaar, cl-test-caadr)
(cl-test-ldiff): New tests.
(cl-digit-char-p): Tighten the test.

Fixes: debbugs:8983

* net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes
from RFC2798 Section 9.1.1.  (Bug#8983)

* lisp/emacs-lisp/seq.el: Make seq-into a public function (replacing
seq--into)
* test/automated/seq-tests.el: Add tests for seq-into
* doc/lispref/sequences.texi: Add documentation for seq-into

Fixes: debbugs:19285

* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.

Fixes: debbugs:18644

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider
`=' a part of symbol when followed by `>'.

The following commit was skipped:

b21a56ac Bump version to 24.4.91

113fcc3b * etc/AUTHORS: Update the AUTHORS file
51c0c8dc * lisp/ChangeLog: Fix a changelog entry

Conflicts:
	etc/AUTHORS

The following commit was skipped:

9869d6f6 Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.

344c6ada Improve MS-Windows build instructions  (Bug#19989)
eb62887e lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
	lisp/ChangeLog
	nt/ChangeLog

The following commit was skipped:

69204d5a # Changelog fixes (no need to merge to trunk)

Fixes: bug#19678
Co-authored-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/eudcb-bbdb.el (eudc-bbdb-field): New function.
(eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field.
(eudc-bbdb-format-record-as-result): Likewise.

lisp/gnus/gnus-notifications.el (gnus-notifications-action): Replace x-focus-frame kludge by calling gnus-select-frame-set-input-focus

Fixes: debbugs:17733

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false.  Highlight
`self' as a keyword.

* test/indent/ruby.rb: Add an example for bug#20026.

Fixes: debbugs:20026

* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.

* test/indent/js.js: Set `js-indent-level' to 2. Fix indentation in an
example.

lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined

Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.

This reverts commit 5ab767b8.

Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom.

 nt/INSTALL: Add some more installation instructions for mingw-get
 users.

 src/w32fns.c <ImmReleaseContext_Proc, ImmSetCompositionWindow_Proc>:
 Fix typedefs to be consistent with the corresponding w32 API
 signatures.
 (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Don't invoke
 DefWindowProc if we successfully handled the message, as doing so
 causes problems in displaying selection dialogs.

* lisp/gnus/registry.el (registry-lookup-breaks-before-lexbind)
(registry-search, registry-delete, registry-size, registry-insert)
(registry-reindex, registry-collect-prune-candidates, registry-lookup):
* lisp/gnus/gnus-registry.el (gnus-registry-fixup-registry)
(gnus-registry-remove-extra-data): Use slot names rather than initarg
names in `oref' and `oset'.

* lisp/battery.el (battery-echo-area-format): Simplify default.
(battery-linux-sysfs): Standardize on energy&power.  Accept ADP1
for AC adapter.

unfold `closure's since byte-compile-unfold-lambda doesn't know how to
do it.