GitLab

Reduce the number of iterations to 250 in case of w32notify.

* etc/NEWS: Explain in more detail the effects of the new
default sorting in ls-lisp on Dired display.  (Bug#22561)

* lisp/net/tls.el (tls-program): Document the %t parameter (bug#22559).

* lisp/net/nsm.el (nsm-query-user): Restore the window configuration.

Backport:

Fixes bug#7579.

lisp/progmodes/cc-engine.el (c-forward-declarator): Add extra optional
parameter to enable handling of "anonymous" declarators in declarations.

lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Check more rigorously
whether a "(" opens a parameter list of a function, or an initialization of a
variable.

* newst-treeview.el (newsticker-treeview-selection-face): Improve
readability for dark background.

* lib-src/etags.c (Ruby_functions): Don't tag accessors whose
names are not literal symbols.  (Bug#22241)

* test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
(http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
* test/etags/CTAGS.good:
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6: Adjust accordingly.

* lisp/net/eww.el (eww-tag-input): Allow sending empty hidden
values (bug#22388).

Copyright-paperwork-exempt: Yes
(cherry picked from commit 5898da82)

Backport:

* lisp/erc/erc.el (erc-channel-receive-names): Output a warning
instead of erroring out on unknown prefix chars (bug#22380).

* lisp/erc/erc.el (erc-completion-at-point): Make erc completion
case-insensitive again (bug#11360).

* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
case in the complection consistent (bug#18509).

Copyright-paperwork-exempt: Yes

* lisp/erc/erc.el (erc-kill-query-buffers): Don't bug out if we're
issuing /QUIT to disconnected servers (bug#22099).

* lisp/erc/erc-track.el (erc-faces-in): Always return lists of
faces to avoid later ambiguity (bug#22424).

Copyright-paperwork-exempt: Yes

* lisp/net/shr.el (shr-put-image): Don't bug out on alt-less
images on non-graphical displays (bug#22327).

* lisp/net/eww.el (eww-list-bookmarks): Pop to the buffer before
preparing it so that the widths are computed correctly (bug#22328).

* lisp/net/eww.el (eww-make-unique-file-name): Make this function
actually work.

* lisp/net/eww.el (eww-tag-input): Make it possible to TAB to
input fields (bug#22540).

* lisp/net/shr.el (shr-tag-img): When images are disabled, insert
the complete alt/title string (bug#22293).

* lisp/net/eww.el (eww-process-text-input): Allow text fields to
grow when typing in stuff that's longer than the original width.

* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): New functions to do word-based
things when subword-mode is switched on.

* lisp/erc/erc-button.el (erc-button-add-nickname-buttons): Use them
(bug#17558).

* doc/misc/gnus.texi (Client-Side IMAP Splitting): Fix example.

* lisp/emacs-lisp/bytecomp.el (byte-compile-setq, byte-compile-funcall):
* lisp/gnus/mml-smime.el (mml-smime-get-dns-cert)
(mml-smime-get-ldap-cert):
Follow user style preference when quoting diagnostics.

* lisp/files.el (hack-local-variables): use 'thisbuf' to reference
the original buffer name in the warning message.  (Bug#21681)

* lib-src/etags.c (Ruby_functions): Handle continuation lines in
Ruby accessor definitions.  (Bug#22241)

* test/etags/ruby-src/test1.ru (A::B#X): Add some more tests for
accessors and multiline definitions.
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to changes in Ruby tags.

* src/menu.c (Fx_popup_menu): Be sure to initialize 'x' and 'y'
for the TTY case without a mouse.  (Bug#22538)

* lisp/net/eww.el: pop-to-buffer-same-window throughout instead of
switch-to-buffer (bug#22244).

* src/Makefile.in ($(lispsource)/term/ns-win.elc): Add order-only
dependency on $(lispsource)/international/charprop.el.
(Bug#22501)

* lib-src/etags.c (Ruby_functions): Don't include the leading
colon ':' in tags for Ruby accessors and aliases.  (Bug#22241)

* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to changes in Ruby tags.

* lib-src/etags.c (get_language_from_filename): If FILE includes a
leading directory, compare only its basename to the known file
names in lang_names[].

* test/etags/Makefile (RBSRC): Adapt to recent test1.ruby
renaming.
* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/ETAGS.good_6:
* test/etags/CTAGS.good: Adapt to changes in Ruby file names and
to the results in Makefile due to the above etags.c fix.

* lib-src/etags.c <Ruby_filenames>: New variable, holds names
of Ruby files.
<Ruby_suffixes>: Treat .rb, .ru, and .rbw as Ruby extensions.
<lang_names>: Add Ruby_filenames to the Ruby entry.
* test/etags/ruby-src/test1.ru: Renamed from test1.ruby.
(Bug#22241)