[Emacs-diffs] scratch/org-mode-merge updated (20e006f -> 5ca1888)

[Bastien Guerry]

bastien1 pushed a change to branch scratch/org-mode-merge.

      from  20e006f   ; Fix version in orgcard.tex
      adds  d533f5f   Do not hard code A1 cell reference, as it may be renamed.
      adds  eebb978   Fix symbol relocation when the relocated cell is renamed.
      adds  0ee2e85   * lisp/descr-text.el (describe-char): Avoid 
string-*-multibyte
      adds  21132e2   unidata: don’t check special casing in unidata-check  
(bug#26656)
      adds  18896f7   * lisp/net/shr.el (shr-fill-text): Actually fill the 
text.  (Bug#27399)
      adds  f6ef15c   Use unlocked stdio more systematically
      adds  dfe73cb   Remove getc_unlocked configure-time check
      adds  2f943ab   Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
      adds  4bd4df4   * lisp/net/html2text.el: Move to obsolete/.
      adds  c75eb10   Don't change byte-compile-delete-errors at runtime 
(Bug#27340)
      adds  4314713   Adjust lm-verify to accept current notices
      adds  1886246   Provide additional support for child frames
      adds  b0042b7   Make CC Mode load cl-lib rather than cl in Emacs 26.
      adds  51e8e77   * lisp/subr.el (setq-local): Add debug declaration 
(Bug#27408).
      adds  68e03d1   Fix Android 6/7 problems in Tramp
      adds  b2f8159   Port recent frame changes to GCC 7
      adds  c05e3aa   Parenthesize frame.h macro definitions
      adds  b2bff45   Omit null-pointer test in intervals.h FRAME
      adds  ebb4e61   * lisp/progmodes/cc-fonts.el: Remove/mark unused vars
      adds  cb5d6e0   Don't quote lambda forms
      adds  6dd0462   Use #' instead of (function ...)
      adds  b9e17e2   Prefer `when' instead of 1-branch `if'
      adds  5377709   ; * src/emacs-module.c (module_make_string): Add another 
FIXME
      adds  1771d9b   Fix bug in handling GnuPG's TRUST_MARGINAL status
      adds  4a5653c   Avoid segfaults when some display vector is an empty 
string
      adds  2d99269   Don't read eshell/which output from *Help* buffer 
(Bug#26894)
      adds  e06b547   Make tcl-auto-fill-mode obsolete (Bug#10772)
      adds  5d45ba1   Replace with dolist some uses of while
      adds  d3a208e   Don't assume url structs are vectors (Bug#27333)
      adds  3b19663   * lisp/url/url-history.el: Use lexical-binding
      adds  138447c   Improve timer handling when Tramp accepts output
      adds  522e3c1   Operate on frame list instead of printed backtrace
      adds  ead5458   Improve ert backtrace recording
      adds  eb9d3ec   Escape control characters in backtraces (Bug#6991)
      adds  b567c48   Don't redundantly cl-print arglist in function docstring 
again
      adds  0ae28c7   Hide byte code in backtraces (Bug#6991)
      adds  c87c87f   Escape NUL bytes in X selections (Bug#6991)
      adds  169532b   ; Merge: Backtrace printing improvements (Bug#6991)
      adds  ceedd86   Release Tramp 2.3.2
      adds  7618d29   * lisp/emacs-lisp/debug.el (debugger-list-functions): 
Remove obsolete msg
      adds  6fb45b7   * lisp/emacs-lisp/cl-extra.el (cl--random-state): New 
defstruct
      adds  23ff664   * lisp/help-fns.el (describe-variable): Let-bind 
cl-print-compiled-button.
      adds  a75380f   ; Instrument test/Makefile.in for tramp-tests output on 
hydra
      adds  98cbba8   ; Fix last commit
      adds  ff6d090   ; Auto-commit of loaddefs files.
      adds  0ad5fd4   Fix threads on NS (bug#25265)
      adds  2bd32ed   Refactor key describing commands
      adds  e620bbe   Ignore mouse-movement for describe-key-briefly (Bug#12204)
      adds  59d0787   Make C++ digit separators work.  Amend the handling of 
single quotes generally
      adds  8a9ebf3   Minor copyedits of manuals regarding bidi conformance
      adds  0489f2c   Improve C++98 compatibility
      adds  c2f518c   Also mark module init function as noexcept if possible
      adds  11cbedc   * src/module-env-25.h (copy_string_contents): Fix comment.
      adds  9a2a7bb   Let test summary go through even if some logs were not 
generated
      adds  3269a58   ; Instrument tramp-tests.el
      adds  c7e7eb3   Fix Bug#27502
      adds  4383ff8   ; Instrument tramp-tests.el
      adds  95343da   Adapt Lisp reference to reader changes
      adds  3bab927   Remove FIXME comments about sentinel values
      adds  80e200c   Fix bug in yesterday's CC Mode commit.
      adds  a8b71b3   Extend dired-do-shell-command substitutions
      adds  6e39940   Ask confirmation for all suspicious wildcards
      adds  d90b98a   * doc/misc/tramp.texi: Replace ftp:// and http:// URLs by 
https://.
      adds  34d4720   Electric quotes: Improve support for Markdown mode 
(Bug#24709)
      adds  9a65b57   * lisp/emacs-lisp/cl-print.el (cl-print-compiled-button): 
t by default.
      adds  1fd6ca4   Make eww-search-words prompt for query if nothing selected
      adds  1b4f0a9   Split shr-copy-url dwim behavior into separate functions 
(Bug#26826)
       new  5ca1888   Merge branch 'master' into scratch/org-mode-merge


Summary of changes:
 admin/merge-gnulib                     |   2 +-
 admin/unidata/unidata-gen.el           |  94 ++--
 configure.ac                           |   2 +-
 doc/emacs/dired.texi                   |  26 +-
 doc/emacs/help.texi                    |   7 +-
 doc/emacs/killing.texi                 |   4 +
 doc/emacs/mule.texi                    |   8 +-
 doc/lispref/display.texi               |  71 ++-
 doc/lispref/elisp.texi                 |   2 +
 doc/lispref/frames.texi                | 510 ++++++++++++++++-----
 doc/lispref/modes.texi                 |   4 +-
 doc/lispref/objects.texi               |  35 +-
 doc/lispref/windows.texi               | 145 +++++-
 doc/misc/emacs-mime.texi               |   2 +-
 doc/misc/tramp.texi                    |  42 +-
 doc/misc/trampver.texi                 |   2 +-
 etc/NEWS                               |  89 +++-
 lib-src/ebrowse.c                      |   8 +-
 lib-src/emacsclient.c                  |   3 +-
 lib-src/etags.c                        |   1 +
 lib-src/hexl.c                         |   2 +-
 lib-src/make-docfile.c                 |  10 +-
 lib-src/movemail.c                     |   4 +-
 lib-src/profile.c                      |   2 +-
 lib-src/update-game-score.c            |   3 +-
 lib/gnulib.mk.in                       |  11 +-
 lib/unlocked-io.h                      | 136 ++++++
 lisp/autorevert.el                     |  56 +--
 lisp/calc/calc-units.el                |  72 ++-
 lisp/descr-text.el                     |  14 +-
 lisp/dired-aux.el                      | 254 ++++++-----
 lisp/dired.el                          |  27 +-
 lisp/electric.el                       |  66 ++-
 lisp/emacs-lisp/cl-extra.el            |  39 +-
 lisp/emacs-lisp/cl-print.el            |  11 +-
 lisp/emacs-lisp/debug.el               | 188 +++-----
 lisp/emacs-lisp/eieio-core.el          |  10 +-
 lisp/emacs-lisp/ert.el                 |  87 ++--
 lisp/emacs-lisp/lisp-mnt.el            |   7 +-
 lisp/epg.el                            |   2 +-
 lisp/eshell/esh-cmd.el                 |  32 +-
 lisp/frame.el                          |  32 ++
 lisp/help-fns.el                       | 103 +++--
 lisp/help.el                           | 257 +++++------
 lisp/ldefs-boot.el                     |  18 +-
 lisp/minibuffer.el                     |   2 +-
 lisp/mouse.el                          | 433 +++++++++++++++++-
 lisp/net/eww.el                        |  16 +-
 lisp/net/shr.el                        |  87 ++--
 lisp/net/tramp-adb.el                  |  49 ++-
 lisp/net/tramp-compat.el               |   3 +-
 lisp/net/tramp-sh.el                   |  19 +-
 lisp/net/tramp.el                      |  91 ++--
 lisp/net/trampver.el                   |   6 +-
 lisp/{net => obsolete}/html2text.el    |   3 +
 lisp/progmodes/cc-cmds.el              |   2 +-
 lisp/progmodes/cc-defs.el              |  91 +++-
 lisp/progmodes/cc-engine.el            |   4 +-
 lisp/progmodes/cc-fonts.el             |  47 +-
 lisp/progmodes/cc-langs.el             |  24 +-
 lisp/progmodes/cc-mode.el              | 298 +++++++++----
 lisp/progmodes/cc-styles.el            |   1 +
 lisp/progmodes/tcl.el                  |   5 +-
 lisp/select.el                         |   3 +
 lisp/ses.el                            |  49 ++-
 lisp/subr.el                           |   4 +-
 lisp/term/w32-win.el                   |   2 +-
 lisp/tooltip.el                        |   6 +-
 lisp/url/url-history.el                |   9 +-
 lisp/window.el                         | 615 +++++++++++++++++---------
 m4/gnulib-comp.m4                      |   4 +
 m4/unlocked-io.m4                      |  41 ++
 src/charset.c                          |   6 +-
 src/cm.c                               |  14 +-
 src/dispextern.h                       |  36 +-
 src/dispnew.c                          |  32 +-
 src/emacs-module.c                     |   6 +-
 src/emacs-module.h.in                  |   3 +-
 src/emacs.c                            |   8 +-
 src/fileio.c                           |  16 +-
 src/frame.c                            | 783 ++++++++++++++++++++++++++-------
 src/frame.h                            |  63 ++-
 src/gtkutil.c                          |   2 +
 src/image.c                            |  11 +-
 src/intervals.h                        |  12 +-
 src/keyboard.c                         |  71 ++-
 src/lread.c                            |  11 +-
 src/minibuf.c                          |  34 +-
 src/module-env-25.h                    |   2 +-
 src/nsfns.m                            |  12 +
 src/nsterm.h                           |  15 +-
 src/nsterm.m                           |  26 +-
 src/print.c                            |  55 ++-
 src/process.c                          |  13 +-
 src/sysdep.c                           |  15 +-
 src/sysstdio.h                         |  41 ++
 src/systhread.c                        |  11 +
 src/term.c                             |  47 +-
 src/w32fns.c                           |  41 +-
 src/w32term.c                          |  63 ++-
 src/w32term.h                          |   8 +
 src/window.c                           | 213 ++++++++-
 src/window.h                           | 200 ++++-----
 src/xdisp.c                            | 190 ++++++--
 src/xfaces.c                           |   2 +-
 src/xfns.c                             | 101 ++++-
 src/xterm.c                            |  16 +
 src/xterm.h                            |   8 +
 test/Makefile.in                       |   3 +-
 test/lisp/electric-tests.el            | 116 +++++
 test/lisp/emacs-lisp/cl-print-tests.el |   2 +-
 test/lisp/emacs-lisp/ert-tests.el      |   8 +-
 test/lisp/net/tramp-tests.el           | 255 +++++++----
 113 files changed, 4945 insertions(+), 2040 deletions(-)
 create mode 100644 lib/unlocked-io.h
 rename lisp/{net => obsolete}/html2text.el (99%)
 create mode 100644 m4/unlocked-io.m4