Fix inability to turn show-paren-local-mode on manually (bug#61098)

* lisp/paren.el (show-paren-local-mode): Don't kill the local
value when both local and global are t.  Because the
show-paren-predicate check in show-paren-function also checks
whether a local (non-nil) value of this variable exists.

diff --git a/lisp/paren.el b/lisp/paren.el
index d1623a2b24854ec887a61a0c31d5c9af7385d18e..7ee4e9ae6821beb1aeb0283fa3f856c88565ac04 100644 (file)
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -166,8 +166,8 @@ use `show-paren-local-mode'."
   (cond
    ((eq show-paren-mode (default-value 'show-paren-mode))
     (unless show-paren-mode
-      (show-paren--delete-overlays))
-    (kill-local-variable 'show-paren-mode))
+      (show-paren--delete-overlays)
+      (kill-local-variable 'show-paren-mode)))
    ((not (default-value 'show-paren-mode))
     ;; Locally enabled, but globally disabled.
     (show-paren-mode 1)                ; Setup the timer.