From 8f0ffecb430fffc8e32bb49bdc33becfa6846647 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 22 Sep 2022 01:52:26 +0100
Subject: obsolete names of boolean customization flags ending in -p

The -p suffix, meaning predicate, is meant for functions (which is what a
predicate is).
---
 geiser-guile.el | 35 ++++++++++++++++++++++++++++-------
 readme.org      |  2 +-
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/geiser-guile.el b/geiser-guile.el
index 4bb014c..6db40fa 100644
--- a/geiser-guile.el
+++ b/geiser-guile.el
@@ -65,22 +65,29 @@ If all you want is to load ~/.guile, set
 `geiser-guile-load-init-file-p' instead."
   :type 'string)
 
-(geiser-custom--defcustom geiser-guile-load-init-file-p nil
+(geiser-custom--defcustom geiser-guile-load-init-file nil
   "Whether to load ~/.guile when starting Guile.
 Note that, due to peculiarities in the way Guile loads its init
 file, using `geiser-guile-init-file' is not equivalent to setting
 this variable to t."
   :type 'boolean)
 
-(geiser-custom--defcustom geiser-guile-use-declarative-modules-p nil
+(define-obsolete-variable-alias
+  'geiser-guile-load-init-file-p 'geiser-guile-load-init-file "0.26.2")
+
+(geiser-custom--defcustom geiser-guile-use-declarative-modules nil
   "Whether Guile should use \"declarative\" modules limiting mutability.
 When set to `t', Guile will enforce immutable bindings in
 exported modules."
   :type 'boolean
   :link '(info-link "(guile) Declarative Modules"))
 
+(define-obsolete-variable-alias
+  'geiser-guile-use-declarative-modules-p 'geiser-guile-use-declarative-modules
+  "0.26.2")
+
 (geiser-custom--defcustom geiser-guile-debug-backwards-backtrace t
-  "Whether to configure backtraces using the 'backwards' ordering."
+  "Whether to configure backtraces using the \\='backwards ordering."
   :type 'boolean)
 
 (geiser-custom--defcustom geiser-guile-debug-terminal-width 999
@@ -90,19 +97,30 @@ truncated.  Set to a negative value if you prefer that geiser
 does not set it on startup."
   :type 'integer)
 
-(geiser-custom--defcustom geiser-guile-debug-show-bt-p t
+(geiser-custom--defcustom geiser-guile-debug-show-bt t
   "Whether to automatically show a full backtrace when entering the debugger.
 If nil, only the last frame is shown."
   :type 'boolean)
 
-(geiser-custom--defcustom geiser-guile-debug-show-full-bt-p t
+(define-obsolete-variable-alias
+  'geiser-guile-debug-show-bt-p 'geiser-guile-debug-show-bt "0.26.2")
+
+
+(geiser-custom--defcustom geiser-guile-debug-show-full-bt t
   "Whether to show full backtraces in the debugger, including local variables."
   :type 'boolean)
 
-(geiser-custom--defcustom geiser-guile-show-debug-help-p t
+(define-obsolete-variable-alias
+  'geiser-guile-debug-show-full-bt-p 'geiser-guile-debug-show-full-bt "0.26.2")
+
+
+(geiser-custom--defcustom geiser-guile-show-debug-help t
   "Whether to show brief help in the echo area when entering the debugger."
   :type 'boolean)
 
+(define-obsolete-variable-alias
+  'geiser-guile-show-debug-help-p 'geiser-guile-show-debug-help "0.26.2")
+
 (geiser-custom--defcustom geiser-guile-warning-level 'medium
   "Verbosity of the warnings reported by Guile.
 
@@ -129,10 +147,13 @@ effect on new REPLs.  For existing ones, use the command
   "Extra keywords highlighted in Guile scheme buffers."
   :type '(repeat string))
 
-(geiser-custom--defcustom geiser-guile-case-sensitive-p t
+(geiser-custom--defcustom geiser-guile-case-sensitive t
   "Non-nil means keyword highlighting is case-sensitive."
   :type 'boolean)
 
+(define-obsolete-variable-alias
+  'geiser-guile-case-sensitive-p 'geiser-guile-case-sensitive "0.26.2")
+
 (geiser-custom--defcustom geiser-guile-manual-lookup-other-window-p nil
   "Non-nil means pop up the Info buffer in another window."
   :type 'boolean)
diff --git a/readme.org b/readme.org
index b275d98..538be89 100644
--- a/readme.org
+++ b/readme.org
@@ -42,7 +42,7 @@ geiser-guile.
   in the way Guile loads the initialization file versus how it loads
   a file specified via the =-l= flag.  If what you want is just
   loading =~/.guile=, leave ~geiser-guile-init-file~ alone and set
-  ~geiser-guile-load-init-file-p~ to ~t~ instead.
+  ~geiser-guile-load-init-file~ to ~t~ instead.
 
   One can also provide a global list of paths to add to Guile's
   =%load-path= via ~geiser-guile-load-path~.
-- 
cgit v1.2.3