9 files changed, 25 insertions, 45 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 0eea73e..a92cb35 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -53,8 +53,7 @@ when `geiser-autodoc-display-module-p' is on."
 
 ;;; Procedure arguments:
 
-(make-variable-buffer-local
- (defvar geiser-autodoc--cached-signatures nil))
+(defvar-local geiser-autodoc--cached-signatures nil)
 
 (defsubst geiser-autodoc--clean-cache ()
   (setq geiser-autodoc--cached-signatures nil))
@@ -175,8 +174,7 @@ when `geiser-autodoc-display-module-p' is on."
 
 ;;; Autodoc functions:
 
-(make-variable-buffer-local
- (defvar geiser-autodoc--inhibit-function nil))
+(defvar-local geiser-autodoc--inhibit-function nil)
 
 (defsubst geiser-autodoc--inhibit ()
   (and geiser-autodoc--inhibit-function
@@ -204,9 +202,8 @@ when `geiser-autodoc-display-module-p' is on."
 
 ;;; Autodoc mode:
 
-(make-variable-buffer-local
- (defvar geiser-autodoc-mode-string " A"
-   "Modeline indicator for geiser-autodoc-mode"))
+(defvar-local geiser-autodoc-mode-string " A"
+  "Modeline indicator for geiser-autodoc-mode")
 
 (define-minor-mode geiser-autodoc-mode
   "Toggle Geiser's Autodoc mode.
diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
index a7595f1..1383584 100644
--- a/elisp/geiser-company.el
+++ b/elisp/geiser-company.el
@@ -23,14 +23,11 @@
 
 ;;; Helpers:
 
-(make-variable-buffer-local
- (defvar geiser-company--enabled-flag nil))
+(defvar-local geiser-company--enabled-flag nil)
 
-(make-variable-buffer-local
- (defvar geiser-company--autodoc-flag nil))
+(defvar-local geiser-company--autodoc-flag nil)
 
-(make-variable-buffer-local
- (defvar geiser-company--completions nil))
+(defvar-local geiser-company--completions nil)
 
 (defun geiser-company--candidates (prefix)
   (and (equal prefix (car geiser-company--completions))
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index 9a1eebf..c479972 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -176,9 +176,8 @@ we're looking for a module name.")
 
 ;;; Smart tab mode:
 
-(make-variable-buffer-local
- (defvar geiser-smart-tab-mode-string " SmartTab"
-   "Modeline indicator for geiser-smart-tab-mode"))
+(defvar-local geiser-smart-tab-mode-string " SmartTab"
+  "Modeline indicator for geiser-smart-tab-mode")
 
 (define-minor-mode geiser-smart-tab-mode
   "Toggle smart tab mode.
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 342ce7f..9b98373 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -27,8 +27,7 @@
 
 ;;; Buffer connections:
 
-(make-variable-buffer-local
- (defvar geiser-con--connection nil))
+(defvar-local geiser-con--connection nil)
 
 (defun geiser-con--get-connection (buffer/proc)
   (if (processp buffer/proc)
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index edd6dab..419364d 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -131,8 +131,7 @@ help (e.g. browse an HTML page) implementing this method.")
           (let ((geiser-eval--get-module-function (lambda (x) module)))
             (geiser-doc-symbol target module impl)))))))
 
-(make-variable-buffer-local
- (defvar geiser-doc--buffer-link nil))
+(defvar-local geiser-doc--buffer-link nil)
 
 (defsubst geiser-doc--implementation ()
   (geiser-doc--link-impl geiser-doc--buffer-link))
diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index 9e8e609..80a40fd 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -24,8 +24,7 @@
 
 ;;; Plug-able functions:
 
-(make-variable-buffer-local
- (defvar geiser-eval--get-module-function nil))
+(defvar-local geiser-eval--get-module-function nil)
 (set-default 'geiser-eval--get-module-function nil)
 
 (defvar geiser-eval--get-impl-module nil)
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index b67c6bf..c1dc065 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -57,8 +57,7 @@ in order to determine its scheme flavour."
 
 (geiser-custom--memoize 'geiser-impl--load-files)
 
-(make-variable-buffer-local
- (defvar geiser-impl--implementation nil))
+(defvar-local geiser-impl--implementation nil)
 
 (defsubst geiser-impl--impl-str (&optional impl)
   (let ((impl (or impl geiser-impl--implementation)))
@@ -246,10 +245,9 @@ switcher (switch-to-NAME), and provides geiser-NAME."
 
 ;;; Trying to guess the scheme implementation:
 
-(make-variable-buffer-local
- (defvar geiser-scheme-implementation nil
-   "Set this buffer local variable to specify the Scheme
-implementation to be used by Geiser."))
+(defvar-local geiser-scheme-implementation nil
+  "Set this buffer local variable to specify the Scheme
+implementation to be used by Geiser.")
 
 (put 'geiser-scheme-implementation 'safe-local-variable 'symbolp)
 
diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index 61a9813..4a524fd 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -340,9 +340,8 @@ With prefix, try to enter the current buffer's module."
 
 ;;; Geiser mode:
 
-(make-variable-buffer-local
- (defvar geiser-mode-string nil
-   "Modeline indicator for geiser-mode"))
+(defvar-local geiser-mode-string nil
+  "Modeline indicator for geiser-mode")
 
 (defun geiser-mode--lighter ()
   (or geiser-mode-string
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index 3311c77..73a2f39 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -267,11 +267,9 @@ module command as a string")
 (defvar geiser-repl--last-output-start nil)
 (defvar geiser-repl--last-output-end nil)
 
-(make-variable-buffer-local
- (defvar geiser-repl--repl nil))
+(defvar-local geiser-repl--repl nil)
 
-(make-variable-buffer-local
- (defvar geiser-repl--project nil))
+(defvar-local geiser-repl--project nil)
 
 (defsubst geiser-repl--set-this-buffer-repl (r)
   (setq geiser-repl--repl r))
@@ -383,11 +381,9 @@ module command as a string")
 
 ;;; REPL connections
 
-(make-variable-buffer-local
- (defvar geiser-repl--address nil))
+(defvar-local geiser-repl--address nil)
 
-(make-variable-buffer-local
- (defvar geiser-repl--connection nil))
+(defvar-local geiser-repl--connection nil)
 
 (defun geiser-repl--local-p ()
   "Return non-nil, if current REPL is local (connected to socket)."
@@ -942,8 +938,7 @@ over a Unix-domain socket."
          (expand-file-name (read-file-name "Socket file name: "))))
   (geiser-repl--start-repl impl socket))
 
-(make-variable-buffer-local
- (defvar geiser-repl--last-scm-buffer nil))
+(defvar-local geiser-repl--last-scm-buffer nil)
 
 (defun geiser-repl--maybe-remember-scm-buffer (buffer)
   (when (and buffer
@@ -951,11 +946,9 @@ over a Unix-domain socket."
              (eq major-mode 'geiser-repl-mode))
     (setq geiser-repl--last-scm-buffer buffer)))
 
-(make-variable-buffer-local
- (defvar geiser-repl--binary nil))
+(defvar-local geiser-repl--binary nil)
 
-(make-variable-buffer-local
- (defvar geiser-repl--arglist nil))
+(defvar-local geiser-repl--arglist nil)
 
 (defun geiser-repl--get-binary (impl)
   (or geiser-repl--binary (geiser-repl--binary impl)))