From: Stefan Kangas <stefankangas@gmail.com>
Date: Tue, 25 Aug 2020 22:37:40 +0000 (+0200)
Subject: Add package prefix to jsonrpc defconst
X-Git-Tag: emacs-28.0.90~6402
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65543b5a879315031d275c7a9a9eb2e26452eb10;p=emacs.git

Add package prefix to jsonrpc defconst

* lisp/jsonrpc.el (jsonrpc-default-request-timeout): Rename from
'jrpc-default-request-timeout'.
(jrpc-default-request-timeout): Make into obsolete variable alias
for 'jsonrpc-default-request-timeout'.  (Bug#40054)
---

diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index ff8f250a22e..2d50df70fd4 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -329,7 +329,10 @@ ignored."
                            :method method
                            :params params))
 
-(defconst jrpc-default-request-timeout 10
+(define-obsolete-variable-alias 'jrpc-default-request-timeout
+  'jsonrpc-default-request-timeout "28.1")
+
+(defconst jsonrpc-default-request-timeout 10
   "Time in seconds before timing out a JSONRPC request.")
 
 
@@ -617,7 +620,7 @@ With optional CLEANUP, kill any associated buffers."
                                     params
                                     &rest args
                                     &key success-fn error-fn timeout-fn
-                                    (timeout jrpc-default-request-timeout)
+                                    (timeout jsonrpc-default-request-timeout)
                                     (deferred nil))
   "Does actual work for `jsonrpc-async-request'.