[elpa] scratch/hyperbole-merge-7.0.2b 66106d3 08/23: Fixed issue with inhibit-hyperbole-messaging not be set properly

[Stefan Monnier]

branch: scratch/hyperbole-merge-7.0.2b
commit 66106d3249a784f7c970423dec7c45ccd8945206
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>

    Fixed issue with inhibit-hyperbole-messaging not be set properly
---
 Changes      |  5 +++++
 hsettings.el | 18 ++++++++++++++++++
 hyperbole.el | 18 ------------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Changes b/Changes
index bccbe59..a9a9bae 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+2017-12-29  Bob Weiner  <address@hidden>
+
+* hsettings.el (inhibit-hyperbole-messaging): Moved this from hyperbole.el to 
here to prevent
+    it being reset when hyperbole-toggle-messaging reloads the hyperbole 
library.
+
 2017-12-20  Bob Weiner  <address@hidden>
 
 * kotl/kexport.el (kexport:html-file-klink)
diff --git a/hsettings.el b/hsettings.el
index a980698..d3c37f5 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -149,6 +149,24 @@ package to display search results."
                              search-term)))
       (user-error "(Hyperbole): Invalid web search service `%s'" 
service-name))))
 
+(defcustom inhibit-hyperbole-messaging t
+  "*Determines whether Hyperbole supports explicit buttons in mail and news 
buffers.
+The default of t means disable such support (work remains to
+modernize these features).  When t, Hyperbole will not alter
+messaging mode hooks nor overload functions from these packages,
+preventing potential incompatibilities.
+
+If you want to use Hyperbole buttons in mail and news buffers, set
+this variable to nil by adding (hyperbole-toggle-messaging 1)
+to your personal Emacs initialization file, prior to loading
+Hyperbole, and then restart Emacs."
+  :type 'boolean
+  :initialize 'custom-initialize-set
+  :set (lambda (symbol value) 
+        ;; Invert value to produce ARG for hyperbole-toggle-messaging.
+        (hyperbole-toggle-messaging (if value 0 1)))
+  :group 'hyperbole-buttons)
+
 (defcustom hyperbole-web-search-browser-function browse-url-browser-function
   "*Function of one url argument called by any Hyperbole Find/Web search."
   :type 'boolean
diff --git a/hyperbole.el b/hyperbole.el
index 1128370..c1fbcbe 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -177,24 +177,6 @@ context (wherever point is).  {C-u \\[hkey-help]} shows 
what the Assist Key will
   :type 'boolean
   :group 'hyperbole-keys)
 
-(defcustom inhibit-hyperbole-messaging t
-  "*Determines whether Hyperbole supports explicit buttons in mail and news 
buffers.
-The default of t means disable such support (work remains to
-modernize these features).  When t, Hyperbole will not alter
-messaging mode hooks nor overload functions from these packages,
-preventing potential incompatibilities.
-
-If you want to use Hyperbole buttons in mail and news buffers, set
-this variable to nil by adding (hyperbole-toggle-messaging t)
-to your personal Emacs initialization file, prior to loading
-Hyperbole, and then restart Emacs."
-  :type 'boolean
-  :initialize (lambda (symbol value) (set symbol value))
-  :set (lambda (symbol value) 
-        (set symbol (not value))
-        (hyperbole-toggle-messaging nil))
-  :group 'hyperbole-buttons)
-
 ;;; ************************************************************************
 ;;; Public key bindings
 ;;; ************************************************************************