GitLab

This is part one of a two part fix for the GTK scaling
problems.  See the thread starting at
http://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00372.html
for an explanation of why it has been added to Emacs 26.

* src/xfns.c (Fx_display_monitor_attributes_list): Take scaling factor
into account when using GTK to query the monitor dimensions, which
allows frameset-restore to position frames correctly.

Please note this is a bugfix release. See etc/ORG-NEWS for details.

* lisp/frameset.el (frameset-persistent-filter-alist): Specify
that text-pixels values are by default only saved by framesets
so the parameter is not set when restoring (Bug#30141).

* doc/emacs/text.texi (Pages): Improve wording.  Suggested by Will
Korteland <emacs-devel@korte.land> in emacs-manual-bugs@gnu.org.

* doc/emacs/trouble.texi (Emergency Escape, Contributing): Clarify
text.  Suggested by Jonathan Kyle Mitchell <kyle@jonathanmitchell.org>
in emacs-manual-bugs@gnu.org

* doc/emacs/mark.texi (Setting Mark, Marking Objects): Improve and
clarify wording.  Suggested by John Cummings <john@rootabega.net>
in emacs-manual-bugs@gnu.org.

* doc/emacs/buffers.texi (Several Buffers): Correct description of
prefix arguments.  Clarify "bury".
(Buffer Menus): Clarify wording.  Reported by John Cummings
<john@rootabega.net> in emacs-manual-bugs@gnu.org.

Suggested by John Cummings <john@rootabega.net> in
emacs-manual-bugs@gnu.org:
* doc/emacs/buffers.texi (Select Buffer): Add cross-references to
"Windows" and "Frames".
(Misc Buffer, Kill Buffer): Use BUFFER consistently in commands
that accept buffer names.
(Select Buffer): Improve description of "M-g M-g".  Improve
wording.
(Misc Buffer, Kill Buffer): Improve wording.
(Kill Buffer): Fix the response required by kill-some-buffers.
Mention customizable options that control what clean-buffer-list
does.
(Several Buffers): More detail about
'Buffer-menu-unmark-all-buffers'.

* doc/emacs/vc1-xtra.texi (CVS Options):
* doc/emacs/maintaining.texi (VC Directory Buffer): Remove
references to 'vc-stay-local', which no longer exists.
(Bug#30138)

* doc/emacs/calendar.texi (Writing Calendar Files): Capitalize
"Filofax".  Reported by Will Korteland <emacs-devel@korte.land>
in emacs-manual-bugs@gnu.org.

* doc/emacs/killing.texi (CUA Bindings): Improve wording.
Suggested by Will Korteland <emacs-devel@korte.land> in
emacs-manual-bugs@gnu.org.

This reverts commit 4fd446e9:
* lisp/emacs-lisp/bytecomp.el (byte-compile-file):
Put tempfile next to the target file, as was the original intent.

This improves on the recent fix for master failing to build
on FreeBSD.  Suggested by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-01/msg00600.html
* lisp/emacs-lisp/bytecomp.el (byte-compile-file):
Put tempfile next to the target file, as was the original intent.

* doc/emacs/killing.texi (Deletion and Killing): Add
cross-reference to "Kill Ring".
* doc/emacs/help.texi (Help Mode, Package Keywords): Improve
wording.  Suggested by Will Korteland <emacs-devel@korte.land> in
emacs-manual-bugs@gnu.org.

(byte-compile-file): Move comment closer to the code it describes.

* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't create
the temporary file under temporary-file-directory if the file
being compiled is specified by an absolute file name.  This avoids
problems with ACL copying from temporary-file-directory on
FreeBSD.  For the details, see
http://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00513.html.

* src/xwidget.c (webkit_javascript_finished_cb):
* src/gtkutil.c (xg_check_special_colors):
* src/emacs-module.c (module_make_string):
* src/alloc.c (SET_STACK_TOP_ADDRESS): Don't use non-ASCII quote
characters.

* test/Makefile.in (abs_top_srcdir): Add variable, needed by
CPPFLAGS.
* test/data/emacs-module/mod-test.c: Include <limits.h>.
(pT, pZ, T_TYPE, Z_TYPE): Compatibility macros, for systems that
don't support %td and %zu format specs.
(emacs_module_init): Use compatibility macros to make the error
messages print meaningful values (and avoid compiler warnings).

* lisp/term.el (term-mode): Add `name' attribute to
window-adjust-process-window-size-function value, so that it can be
removed easily by tests.
* test/lisp/term-tests.el: New tests.

Check to see if there is an incomplete command at the end of
term-emulate-terminal's input string, and, if so, save it so the whole
command can be processed when the next string arrives.
* lisp/term.el (term-partial-ansi-terminal-message): New variable.
(term-mode): Make it buffer local.
(term-handle-ansi-terminal-messages): Prepend it to the received
message, and set it if a partial message was received.

Copyright-paperwork-exempt: yes

Do not merge to master, it will be solved differently there, see
"Switch term.el to lexical binding, and clean up code a bit".

* lisp/emacs-lisp/shadow.el (load-path-shadows-find): Check for
shadowing with case-insensitive matching for files of case-insensitive
directories (as determined by `file-name-case-insensitive-p').
* test/lisp/emacs-lisp/shadow-tests.el: New test.
* test/lisp/emacs-lisp/shadow-resources/p1/foo.el:
* test/lisp/emacs-lisp/shadow-resources/p2/FOO.el: New test files.

Don't merge to master; this is a quick fix for the emacs-26 branch.  This is
essentially a reversion of the patch from 2017-11-10 which attempted to handle
C99's compound literals.

The bug here was triggered when a defun block contained a declaration ending
in a comma, yet without a semicolon.

* lisp/progmodes/cc-engine.el (c-guess-basic-syntax): At the CASE 9 test,
remove from the `or' form the test of a block's contents.

* doc/man/emacs.1.in: Specify equals sign for long options, as
recommended in the manual.

* nextstep/GNUstep/Emacs.base/Resources/emacs.tiff:
Update to the Emacs 25 icon.
Converted from hicolor/scalable/apps/emacs.svg using Gimp.
* nextstep/GNUstep/Emacs.base/Resources/README: Update.

* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-bug9726)
(vc-bzr-test-bug9781): Skip if bzr is faulty.
* test/src/thread-tests.el: Skip if not compiled with threads.

* lisp/ecomplete.el: Add doc strings and document the format.

* lisp/startup.el (command-line):
Avoid current-load-list being non-nil after startup ends.

* admin/authors.el (authors-aliases): Replace overly-broad entries.

* lisp/comint.el (comint-interrupt-subjob, comint-kill-subjob)
(comint-quit-subjob, comint-stop-subjob): Remove incorrect
documentation.  (Bug#30079)

* src/emacs-icon.h: Update to the Emacs 25 icon.  (Bug#30047)
Converted from hicolor/scalable/apps/emacs.svg using Gimp.

* doc/lispref/variables.texi (File Local Variables): Improve
wording of last change.

* lisp/dired-aux.el (dired-shell-stuff-it): Handle remote
commands on w32 properly.  (Bug#29149)