Skip to content

Commit 194c132

Browse files
committed
Rename server-buffer parameter to avoid shadowing dynamic variable
server.el (the built-in Emacs server) defines server-buffer as a defvar, so any function or lambda taking server-buffer as a lexical argument shadows it within that scope. The byte compiler warns about this because dynamic-variable shadowing is a frequent source of subtle bugs. Rename to server-buf to sidestep the conflict.
1 parent 15d9119 commit 194c132

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

lisp/cider.el

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,10 +1209,10 @@ nil."
12091209
(cider-verify-clojurescript-is-present)
12101210
(cider-verify-cljs-repl-requirements cljs-type)))
12111211

1212-
(defun cider--offer-to-open-app-in-browser (server-buffer)
1213-
"Look for a server address in SERVER-BUFFER and offer to open it."
1214-
(when (buffer-live-p server-buffer)
1215-
(with-current-buffer server-buffer
1212+
(defun cider--offer-to-open-app-in-browser (server-buf)
1213+
"Look for a server address in SERVER-BUF and offer to open it."
1214+
(when (buffer-live-p server-buf)
1215+
(with-current-buffer server-buf
12161216
(save-excursion
12171217
(goto-char (point-min))
12181218
(when-let* ((url (and (search-forward-regexp "http://localhost:[0-9]+" nil 'noerror)
@@ -1272,11 +1272,11 @@ project context even if the user has switched buffers in the meantime."
12721272
(plist-get params :project-dir)
12731273
(plist-get params :jack-in-cmd)
12741274
(when on-port-callback
1275-
(lambda (server-buffer)
1275+
(lambda (server-buf)
12761276
(if (buffer-live-p orig-buffer)
12771277
(with-current-buffer orig-buffer
1278-
(funcall on-port-callback server-buffer))
1279-
(funcall on-port-callback server-buffer)))))))
1278+
(funcall on-port-callback server-buf))
1279+
(funcall on-port-callback server-buf)))))))
12801280

12811281
(defun cider--update-params (params)
12821282
"Fill-in the passed in PARAMS plist needed to start an nREPL server.
@@ -1313,8 +1313,8 @@ double prefix prompt for all these parameters."
13131313
(let ((params (cider--update-params params)))
13141314
(cider--start-nrepl-server
13151315
params
1316-
(lambda (server-buffer)
1317-
(cider-connect-sibling-clj params server-buffer)))))
1316+
(lambda (server-buf)
1317+
(cider-connect-sibling-clj params server-buf)))))
13181318

13191319
(defun cider-start-nrepl-server (params)
13201320
"Start an nREPL server for the current project, but don't connect to it.
@@ -1338,8 +1338,8 @@ these parameters."
13381338
(let ((params (cider--update-params params)))
13391339
(cider--start-nrepl-server
13401340
params
1341-
(lambda (server-buffer)
1342-
(cider-connect-sibling-cljs params server-buffer))))))
1341+
(lambda (server-buf)
1342+
(cider-connect-sibling-cljs params server-buf))))))
13431343

13441344
;;;###autoload
13451345
(defun cider-jack-in-clj&cljs (&optional params soft-cljs-start)
@@ -1361,8 +1361,8 @@ only when the ClojureScript dependencies are met."
13611361
(plist-put :do-prompt nil))))
13621362
(cider--start-nrepl-server
13631363
params
1364-
(lambda (server-buffer)
1365-
(let ((clj-repl (cider-connect-sibling-clj params server-buffer)))
1364+
(lambda (server-buf)
1365+
(let ((clj-repl (cider-connect-sibling-clj params server-buf)))
13661366
(if soft-cljs-start
13671367
(when (cider--check-cljs (plist-get params :cljs-repl-type) 'no-error)
13681368
(cider-connect-sibling-cljs params clj-repl))

0 commit comments

Comments
 (0)