Merge remote-tracking branch 'upstream/master'

.github/workflows/stale.yml

@@ -0,0 +1,28 @@
+name: Mark stale issues and pull requests
+
+on:
+ schedule:
+ - cron: '*/15 * * * *'
+
+jobs:
+ stale:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/stale@v1
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ operations-per-run: 100
+ stale-issue-message: >
+ This issue has been automatically marked as stale because it has not
+ had recent activity. It will be closed if no further activity occurs.
+ Please let us know if this issue is still valid!
+ stale-pr-message: >
+ This PR has been automatically marked as stale because it has not had
+ recent activity. It will be closed if no further activity occurs.
+ Please let us know if this PR is still need merging!
+ stale-issue-label: 'stale'
+ exempt-issue-label: 'High Priority'
+ stale-pr-label: 'stale'
+ exempt-pr-label: 'High Priority'
+ days-before-stale: 365
+ days-before-close: 90

.gitignore

@@ -49,6 +49,7 @@ python-*-docs-html
 /srecode-map.el
 /recentf
 .mc-lists.el
+transient/
 
 # Private directory
 private/

CHANGELOG.org

@@ -1,4 +1,8 @@
 * Release 0.200.x
+** 0.200.14 (2022/01/08)
+*** Fixes
+- Small bug fixes
+- Depreciate curated releases
 ** 0.200.13 (2018/01/25)
 *** Fixes
 - Remove =ess-R-object-popup= from =ess= layer (thanks to NGaffney)

core/core-emacs-backports.el

@@ -13,6 +13,18 @@
 ;;
 ;;; License: GPLv3
 
-;; nothing for now
+(when (and (version< "25" emacs-version)
+ (version< emacs-version "26.3"))
+ ;; Hack to prevent TLS error with Emacs 26.1 and 26.2 and gnutls 3.6.4 and
+ ;; above see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341
+ (message (concat "Testing if your Emacs version %s and GnuTLS version "
+ "need the TLS work-around...")
+ emacs-version)
+ (message "More info at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341")
+ (unless (<= libgnutls-version 30603)
+ (message (concat "Your Emacs version %s and GnutTLS version %s "
+ "need the work-around, applying it...")
+ emacs-version libgnutls-version)
+ (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")))
 
 (provide 'core-emacs-backports)

core/core-keybindings.el

@@ -58,7 +58,7 @@ LONG-NAME if given is stored in `spacemacs/prefix-titles'."
  (kbd full-prefix-emacs))))
  ;; define the prefix command only if it does not already exist
  (unless long-name (setq long-name name))
- (which-key-declare-prefixes
+ (which-key-add-key-based-replacements
  full-prefix-emacs (cons name long-name)
  full-prefix (cons name long-name))))
 (put 'spacemacs/declare-prefix 'lisp-indent-function 'defun)
@@ -78,13 +78,13 @@ used as the prefix command."
  " " (substring prefix 1))))
  (unless long-name (setq long-name name))
  (let ((prefix-name (cons name long-name)))
- (which-key-declare-prefixes-for-mode mode
+ (which-key-add-major-mode-key-based-replacements mode
  full-prefix-emacs prefix-name
  full-prefix prefix-name)
  (when (and is-major-mode-prefix dotspacemacs-major-mode-leader-key)
- (which-key-declare-prefixes-for-mode mode major-mode-prefix prefix-name))
+ (which-key-add-major-mode-key-based-replacements mode major-mode-prefix prefix-name))
  (when (and is-major-mode-prefix dotspacemacs-major-mode-emacs-leader-key)
- (which-key-declare-prefixes-for-mode
+ (which-key-add-major-mode-key-based-replacements
  mode major-mode-prefix-emacs prefix-name)))))
 (put 'spacemacs/declare-prefix-for-mode 'lisp-indent-function 'defun)
 

core/core-spacemacs-buffer.el

@@ -17,7 +17,7 @@
 ;;
 ;;; Code:
 
-(defconst spacemacs-buffer-version-info "0.200.13"
+(defconst spacemacs-buffer-version-info "0.200.14"
  "Current version used to display addition release information.")
 
 (defconst spacemacs-buffer-name "*spacemacs*"

core/core-spacemacs.el

@@ -16,6 +16,7 @@
 (defconst emacs-start-time (current-time))
 
 (require 'subr-x nil 'noerror)
+(require 'core-emacs-backports)
 (require 'page-break-lines)
 (require 'core-debug)
 (require 'core-command-line)

core/info/release-notes/0.200.14.txt

@@ -0,0 +1,14 @@
+ ╭───────────────────────────────────────────────────────────╮
+
+ VERSION 0.200.14 (deprecated)
+
+ ╰───────────────────────────────────────────────────────────╯
+
+This is version 0.200.14 of the currently unmaintained master branch. The master
+branch is using curated version of packages for increased stability.
+
+However this approach proofed to be very work intensive and we have therefore
+stopped supplying those versions for now.
+
+As these packages are not longer updated you should consider migrating to the
+maintained "develop" branch.

init.el

@@ -24,7 +24,7 @@
 (defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.")
 =======
 
-(defconst spacemacs-version "0.200.13" "Spacemacs version.")
+(defconst spacemacs-version "0.200.14" "Spacemacs version.")
 (defconst spacemacs-emacs-min-version "24.4" "Minimal version of Emacs.")
 >>>>>>> upstream/master
 

layers/+distributions/spacemacs-bootstrap/packages.el

@@ -322,7 +322,7 @@
  (concat leader-key " m") "major mode commands"
  (concat leader-key " " dotspacemacs-emacs-command-key) "M-x"))
 
- (which-key-declare-prefixes
+ (which-key-add-key-based-replacements
  dotspacemacs-leader-key '("root" . "Spacemacs root")
  dotspacemacs-emacs-leader-key '("root" . "Spacemacs root")
  (concat dotspacemacs-leader-key " m")