GitLab

The latter spelling is more common both within Emacs and in
English-language sources in general (Bug#10048).
* lisp/eshell/esh-util.el (eshell-uniquify-list):
Rename from eshell-uniqify-list.  All callers changed.
* lisp/pcomplete.el (pcomplete-uniquify-list):
Rename from pcomplete-uniqify-list.  All callers changed.

* lisp/gnus/gnus-score.el (gnus-score-find-favorite-words):
Rename from gnus-score-find-favourite-words.
* lisp/hfy-cmap.el (hfy-fallback-color-map)
(hfy-rgb-txt-color-map, hfy-fallback-color-values):
* lisp/htmlfontify.el (hfy-color-vals, hfy-color):
Rename from names that used 'colour' instead of 'color'.

f2caf08c ; Spelling fixes
f0e5f220 * lisp/progmodes/grep.el (zrgrep):
a0f71260 Minor copyedits in doc/emacs/text.texi
adfe2f58 Remove outdated comment in syntax.el
b80e15b6 Prevent Flyspell from changing unrelated words
e3855994 Avoid errors in flymake in builds --without-x
d691e30c More improvements of the Emacs manual

The following commits were skipped:

6719f05f Backport: xref--next-error-function: Move xref's window point
94ff8824 ; * lisp/wheel.el: Rearrange to match master, to reduce me...

* src/alloc.c: 'marker_free_list' -> 'misc_free_list' throughout

* lisp/gnus/mml-sec.el (mml-secure-epg-encrypt):
* lisp/gnus/smime.el (smime-ask-passphrase): Replace obsolete functions.

* doc/misc/mh-e.texi:

Change type from ‘boolean’ to ‘choice’.  Extend docstring.
(isearch-pre-move-point): New variable.
(isearch-pre-command-hook, isearch-post-command-hook):
Handle search-exit-option for values ‘move’ and ‘shift-move’.

* doc/emacs/search.texi (Not Exiting Isearch): Document new
values ‘shift-move’ and ‘move’ of search-exit-option.

https://lists.gnu.org/archive/html/emacs-devel/2018-03/msg00013.html

Let-bind grep-use-null-filename-separator to nil (bug#30559).

* lisp/progmodes/gud.el (gud-gdb):
* lisp/progmodes/gdb-mi.el (gdb):
Suppress "unused lexical argument" warning.

* doc/emacs/text.texi (TeX Mode): Use @code for command markup.
(HTML Mode): Add a note about "C-x C-v" binding in HTML mode.

* lisp/simple.el (next-error-last-buffer): Improve commentary.
(Bug#20489)

* lisp/emacs-lisp/syntax.el (syntax-ppss-toplevel-pos): Remove
outdated comment.  (Bug#30617)

* lisp/progmodes/perl-mode.el (perl-font-lock-keywords-1): Prevent
the regexp from matching keywords if they start with a Perl sigil.
(Bug#30549)

* lisp/textmodes/flyspell.el (flyspell-auto-correct-word): Avoid
using stale cached data from previous invocations of this command.
(Bug#30462)

* lisp/progmodes/flymake.el: Require 'mwheel'.  (Bug#28732)

* doc/emacs/rmail.texi (Rmail Reply, Rmail Sorting): Improve
wording.  Suggested by Daniel Chakraborty
<danielmchakraborty@gmail.com>.

* doc/emacs/glossary.texi (Glossary): Add cross-references.
Improve and clarify wording.  Suggested by Gijs Hillenius
<gijs@hillenius.net> in emacs-manual-bugs@gnu.org.

* doc/emacs/text.texi (Org Authoring): Add more supported formats
to the list.
(TeX Print): Improve wording.  Slightly rearrange stuff.
(TeX Misc): Mention doctex-mode-hook.
(Two-Column): Minor rearrangement of text.  Suggested by Michael
Albinus <michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.

* doc/emacs/misc.texi (Saving Emacs Sessions):
* doc/emacs/programs.texi (Program Modes): Remove redundant text
and index entries.

* lisp/eshell/em-dirs.el (eshell-dirs-initialize, eshell/pwd):
* lisp/eshell/em-script.el (eshell-script-initialize):
* lisp/eshell/em-unix.el (eshell/whoami):
* lisp/eshell/esh-proc.el (eshell/jobs): Mark unused arguments.

* lisp/progmodes/xref.el (xref--next-error-function): Move
xref's window point if it's visible.  When we don't do that,
navigation can start looping after a while.

(cherry picked from commit 108ce844)

No need to merge to master.

0213c8bf (origin/emacs-26) mwheel minor consistency fix
82f12b2f * src/window.c (Frecenter): Improve commentary.
04da8f4c Fix downloading non-text files in EWW
832b9ece ; Spelling fixes
dd88499e ; Spelling fixes
3968f72b Rename some mwheel options, for consistency
d6e78de5 * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387d Improve the Emacs manual
56ab8e3b * lisp/dired-aux.el (dired-do-create-files): Doc fix.  (Bug#3...

Conflicts:
	etc/NEWS
	lisp/mwheel.el

The following commit was skipped:

dde91a37 ; Auto-commit of loaddefs files.

304278c0 Further improvements on manuals

The following commit was skipped:

ca8afa76 Require a larger stack size for threads on macOS (bug#30364)

* lisp/mwheel.el (mwheel-scroll-left-function)
(mwheel-scroll-right-function):
Change from defcustom to defvar, for consistency with pre-existing.

* lisp/net/eww.el (eww-download-callback): Bind
coding-system-for-read to 'no-conversion', to avoid any code- or
EOL-conversions in downloaded files.  (Bug#30664)

See [1] for more discussion.
* lisp/progmodes/python.el (python--prettify-symbols-alist): Define
the obsolete alias before the variable proper, so that we correctly
get the user's settings regardless of which name they set.
(python-nav-end-of-statement): Add missing backslash.
(python-shell-send-file): Call `expand-file-name' before
`file-local-name', the expansion of "~" could be different on remote
filenames.
(python-mode): Declare prettify-symbols-alist instead of checking if
it's bound.  Use the non-obsolete python-prettify-symbols-alist name,
rather than checking if the obsolete name is bound (it always is too,
but the Emacs 24 byte compiler doesn't recognize that
define-obsolete-variable-alias defines a variable).

[1]: https://lists.gnu.org/archive/html/emacs-devel/2018-02/msg00826.html

Without this change, ldefs-boot.el contains a couple of stray NUL
bytes, which cause it to be considered to be a non-text file by
tools like GNU grep.
* lisp/emacs-lisp/autoload.el (autoload-print-form):
Set print-escape-control-characters to t.

* src/print.c (octalout): New function.
(print_vectorlike): When printing bool vectors, use
octal escapes for control characters when
print-escape-control-characters is non-nil, so that
the printed representation avoids encoding issues.
Rename locals to avoid byte-vs-char confusion.
(print_object): Don't output unnecessary zeros when
printing octal escapes.  Simplify by using octalout.

* lisp/mwheel.el (mouse-wheel-tilt-scroll)
(mouse-wheel-flip-direction): Rename from mwheel-tilt-scroll-p,
mwheel-flip-direction.
(mwheel-scroll): Update for option renaming.
* doc/emacs/frames.texi (Mouse Commands):
Update for option renaming.

* lisp/gnus/nnir.el (gnus-inhibit-demon, gnus-article-decode-hook):
Declare dynamic variables.
(nnir-request-group, nnir-retrieve-headers)
(nnir-request-move-article, nnir-request-update-mark)
(nnir-run-swish++, nnir-run-swish-e, nnir-run-namazu)
(nnir-run-notmuch, nnir-registry-action)
(nnir-request-create-group, nnir-request-delete-group)
(nnir-request-list, nnir-request-scan): Mark unused arguments.
(nnir-warp-to-article, nnir-run-imap, nnir-run-gmane)
(nnir-get-active): Remove unused local variables.