1. 03 Aug, 2020 13 commits
    • Philipp Stephani's avatar
      Avoid duplicate Edebug symbols when backtracking (Bug#42701) · ca419812
      Philipp Stephani authored
      When Edebug backtracks, it nevertheless generates definitions for the
      non-matching branches, see Bug#41988 and Bug#42701.  This should be
      fixed eventually (probably by deferring the definition until a branch
      is known to match), but for now add a band-aid to avoid these
      duplicate symbols, at least for anonymous forms.
      
      * lisp/emacs-lisp/edebug.el (edebug-make-enter-wrapper): Regenerate
      anonymous names.
      
      * test/lisp/emacs-lisp/edebug-tests.el
      (edebug-tests-duplicate-symbol-backtrack): New regression test.
      ca419812
    • Glenn Morris's avatar
      Merge from origin/emacs-27 · 16b7f413
      Glenn Morris authored
      8576297b (origin/emacs-27) ; lisp/so-long.el: Prevent potential err...
      986c12b2 ; * lisp/so-long.el: Byte-compilation bug fix
      19f8f36f ; * lisp/so-long.el (so-long-variable-overrides): Improve doc
      83bc4ad3 ; * so-long.el: Documentation and spelling
      72c5f71c Avoid segfaults if XIM is set but not xim_styles
      f54ddb01 (emacs-27) ; * test/lisp/emacs-lisp/generator-tests.el: St...
      
      # Conflicts:
      #	test/lisp/emacs-lisp/generator-tests.el
      16b7f413
    • Glenn Morris's avatar
      ; Merge from origin/emacs-27 · 078d75fb
      Glenn Morris authored
      The following commits were skipped:
      
      d767418b Backport: Make checking for liveness of global values more...
      8c94ca94 Backport: Fix subtle bug when checking liveness of module ...
      8ecca2f0 Backport: Fix memory leak for global module objects (Bug#4...
      078d75fb
    • Glenn Morris's avatar
      Merge from origin/emacs-27 · 78d1092b
      Glenn Morris authored
      e12d1fbc ; ChangeLog.3 and etc/AUTHORS fixes
      748f0d4b * admin/authors.el (authors-aliases): Remove a faulty regexp.
      
      # Conflicts:
      #	etc/AUTHORS
      78d1092b
    • Eli Zaretskii's avatar
      Fix last change in 'try_window' · 99275822
      Eli Zaretskii authored
      * src/xdisp.c (try_window): Don't modify the logic when EOB is in
      the viewport.  (Bug#42653)
      99275822
    • Phil Sainty's avatar
      ; lisp/so-long.el: Prevent potential error if comment-use-syntax is nil · 8576297b
      Phil Sainty authored
      * lisp/so-long.el (so-long-detected-long-line-p): Ensure that
      `comment-start-skip' and `comment-end-skip' are both set if
      `comment-use-syntax' is nil, as `comment-forward' requires them
      to be bound in this scenario.
      8576297b
    • Phil Sainty's avatar
      ; * lisp/so-long.el: Byte-compilation bug fix · 986c12b2
      Phil Sainty authored
      As this `require' is not at the top-level (it is only conditionally
      evaluated, when loading the library over the top of an earlier
      version), we need `eval-and-compile' to ensure that both macros and
      functions from advice.el are accounted for.
      986c12b2
    • Phil Sainty's avatar
    • Phil Sainty's avatar
      ; * so-long.el: Documentation and spelling · 83bc4ad3
      Phil Sainty authored
      Reverting certain changes from commits b0f20651 and d1a791f8.
      
      Please refer to the comments on spelling at the end of the library.
      M-x ispell-buffer should find no misspellings in the documentation.
      See also test/lisp/so-long-tests/spelling-tests.el
      
      (The current spelling will persist while so-long.el is maintained in
      its own Savannah repository, to avoid unnecessary conflicts between
      the two versions.  If in the future it is maintained solely in the
      Emacs repository, changing the spelling would become an option.)
      
      Note that "mitigations" (plural) is intentional -- this library
      identifies a collection of different performance mitigations,
      multiple of which will typically be in effect together.
      83bc4ad3
    • Lars Ingebrigtsen's avatar
      Make `n'/`p' in image-mode also find externally converted images · e1f09607
      Lars Ingebrigtsen authored
      * lisp/image-file.el (image-file-name-regexp): Use it to make
      `n'/`p' in image mode work (bug#39994).
      
      * lisp/image/image-converter.el
      (image-converter-file-name-extensions): New variable to keep track
      of all suffixes.
      (image-convert-p): Update.
      (image-converter--find-converter): Set.
      e1f09607
    • Lars Ingebrigtsen's avatar
      Fix problem with viewing .webp files from .zip buffers · 79527cd5
      Lars Ingebrigtsen authored
      * lisp/image-mode.el (image-toggle-display-image): Make it
      possible to view images (via external formatters, like webp) from
      zip files (and other archive modes) (bug#39994).
      79527cd5
    • Lars Ingebrigtsen's avatar
      Adjust error message in image-mode · 26b9a1da
      Lars Ingebrigtsen authored
      * lisp/image-mode.el (image-mode): Even when
      `image-user-external-converter' is on, we may get
      `unknown-image-type' (bug#39994).  Adjust the error message in
      that case.
      26b9a1da
    • Derek Zhou's avatar
      Fix problem where TLS connections would sometimes hang · f921fece
      Derek Zhou authored
      * src/process.c (wait_reading_process_output): Before the select,
      check every interesting gnutls stream for available data in the
      buffer.  If some of them hit, and either there is no wait_proc or
      the wait_proc is one of the gnutls streams with new data, set the
      select timeout to 0 after the select, and merge the gnutls buffer
      status into the select returns (bug#40665).  This fixes a problem
      where TLS connections would sometimes hang.
      f921fece
  2. 02 Aug, 2020 19 commits
  3. 01 Aug, 2020 8 commits