paredit.el 26v26release

2 files changed, 17 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index a6bcfac..59659bb 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,21 @@ https://paredit.org
 Latest release: https://paredit.org/paredit.el
 Current development version: https://paredit.org/paredit-beta.el
 
-** Version 26 (beta)
+** Version 26 -- 2022-11-26
+
+Minor bug fix release, mainly to set a new branch scheme:
+
+- `master' branch is where development and releases happen
+  => on release, one commit to remove beta and a second to bump version
+- `release' branch points at latest release commit on master
+- no `maint-N' branches
+
+This replaces the old scheme where master was branched into maint-N and
+then the beta tag was stripped off in the maint-N branch, which meant
+no one branch would automatically track the current release as ELPA
+prefers.
+
+Other changes:
 
 *** M-s (paredit-splice-sexp) now restores column in text fields like ielm.
 *** Deletion now respects `delete-active-region'.
diff --git a/paredit.el b/paredit.el
index 4f8c7ab..55d5a68 100644
--- a/paredit.el
+++ b/paredit.el
@@ -3,14 +3,10 @@
 ;; Copyright (C) 2005--2022 Taylor R. Campbell
 
 ;; Author: Taylor R. Campbell <campbell@paredit.org>
-;; Version: 26beta
+;; Version: 26
 ;; Created: 2005-07-31
 ;; Keywords: lisp
 
-;; NOTE:  THIS IS A BETA VERSION OF PAREDIT.  USE AT YOUR OWN RISK.
-;; THIS FILE IS SUBJECT TO CHANGE, AND NOT SUITABLE FOR DISTRIBUTION
-;; BY PACKAGE MANAGERS SUCH AS APT, PKGSRC, MACPORTS, &C.
-
 ;; Paredit is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -127,7 +123,7 @@
 ;;; This assumes Unix-style LF line endings.
 
 (defconst paredit-version 26)
-(defconst paredit-beta-p t)
+(defconst paredit-beta-p nil)
 
 (eval-and-compile