From 18250d15e5f80deca6d6db10c8deda7b58efa0ba Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Fri, 26 Nov 2010 15:19:49 +0100
Subject: Revert "Bug fix: don't intern symbols read by scheme reader"

This reverts commit 801422d1558f488059ede4f9abab5163ca610900.
We cannot blindly substitute make-symbol for intern in the scheme
reader, because we rely on symbol equality elsewhere, often. The fix
will have to be much more careful.
---
 elisp/geiser-base.el    | 1 +
 elisp/geiser-company.el | 4 ++--
 elisp/geiser-guile.el   | 3 +--
 elisp/geiser-impl.el    | 4 ++--
 elisp/geiser-racket.el  | 2 +-
 elisp/geiser-syntax.el  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/elisp/geiser-base.el b/elisp/geiser-base.el
index d232d2f..41fb6fc 100644
--- a/elisp/geiser-base.el
+++ b/elisp/geiser-base.el
@@ -72,3 +72,4 @@
 
 
 (provide 'geiser-base)
+;;; geiser-base.el ends here
diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
index d6f89e1..eadce93 100644
--- a/elisp/geiser-company.el
+++ b/elisp/geiser-company.el
@@ -32,7 +32,7 @@
   (ignore-errors
     (if module
 	(format "%s [module]" id)
-      (or (geiser-autodoc--autodoc (list (list (make-symbol id) 0)) t)
+      (or (geiser-autodoc--autodoc (list (list (intern id) 0)) t)
           (format "%s [local id]" id)))))
 
 (defsubst geiser-company--doc-buffer (id module)
@@ -40,7 +40,7 @@
 
 (defun geiser-company--location (id module)
   (ignore-errors
-    (let ((id (make-symbol id)))
+    (let ((id (intern id)))
       (save-excursion
         (if module
             (geiser-edit-module id 'noselect)
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index 432c0fc..e4473d8 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -114,8 +114,7 @@ This function uses `geiser-guile-init-file' if it exists."
                         (expand-file-name geiser-guile-init-file))))
   `(,@(and (listp geiser-guile-binary) (cdr geiser-guile-binary))
     "-q" "-L" ,(expand-file-name "guile/" geiser-scheme-dir)
-    ,@(apply 'append (mapcar (lambda (p) (list "-L" p))
-                             geiser-guile-load-path))
+    ,@(apply 'append (mapcar (lambda (p) (list "-L" p)) geiser-guile-load-path))
     ,@(and init-file (file-readable-p init-file) (list "-l" init-file)))))
 
 ;;(defconst geiser-guile--prompt-regexp "^[^() \n]+@([^)]*?)> ")
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index 038e72f..7df87cf 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -208,8 +208,8 @@ switcher (switch-to-NAME), and provides geiser-NAME."
         (parent (and (listp name) (cadr name))))
     (unless (symbolp name)
       (error "Malformed implementation name: %s" name))
-    (let ((runner (make-symbol (format "run-%s" name)))
-          (switcher (make-symbol (format "switch-to-%s" name)))
+    (let ((runner (intern (format "run-%s" name)))
+          (switcher (intern (format "switch-to-%s" name)))
           (runner-doc (format "Start a new %s REPL." name))
           (switcher-doc (format "Switch to a running %s REPL, or start one."
                                 name))
diff --git a/elisp/geiser-racket.el b/elisp/geiser-racket.el
index cafaac9..e826bde 100644
--- a/elisp/geiser-racket.el
+++ b/elisp/geiser-racket.el
@@ -144,7 +144,7 @@ This function uses `geiser-racket-init-file' if it exists."
         ((null module) (geiser-racket--implicit-module))
         ((symbolp module) module)
         ((and (stringp module) (file-name-absolute-p module)) module)
-        ((stringp module) (make-symbol module))
+        ((stringp module) (intern module))
         (t nil)))
 
 (defun geiser-racket--symbol-begin (module)
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index 9bb5e2c..65c4813 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -161,7 +161,7 @@ implementation-specific entries for font-lock-keywords.")
              (?\< (geiser-syntax--read/unprintable))
              ((?' ?` ?,) (geiser-syntax--read/next-token))
              (t (let ((tok (geiser-syntax--read/elisp)))
-                  (if tok (cons 'atom (make-symbol (format "#%s" tok)))
+                  (if tok (cons 'atom (intern (format "#%s" tok)))
                     (geiser-syntax--read/next-token))))))
       (?\' (geiser-syntax--read/token '(quote . quote)))
       (?\` (geiser-syntax--read/token
@@ -209,7 +209,7 @@ implementation-specific entries for font-lock-keywords.")
       (vectorb (apply 'vector (geiser-syntax--read/list)))
       ((quote backquote unquote splice) (list (cdr token)
                                               (geiser-syntax--read)))
-      (kwd (make-symbol (format ":%s" (cdr token))))
+      (kwd (intern (format ":%s" (cdr token))))
       (unprintable (format "#<%s>" (cdr token)))
       ((char string atom) (cdr token))
       (t (error "Reading scheme syntax: unexpected token: %s" token)))))
-- 
cgit v1.2.3