diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-11-26 15:19:49 +0100 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-11-26 15:19:49 +0100 |
| commit | acd29c0391dfe8d255c34a61591943d85d821091 (patch) | |
| tree | ccffdc75336dd5780afff38029f874a62b493f79 | |
| parent | c6e745e306a294288a14a6bf2c0d3056b4a637aa (diff) | |
| download | geiser-acd29c0391dfe8d255c34a61591943d85d821091.tar.gz geiser-acd29c0391dfe8d255c34a61591943d85d821091.tar.bz2 | |
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.
| -rw-r--r-- | elisp/geiser-base.el | 1 | ||||
| -rw-r--r-- | elisp/geiser-company.el | 4 | ||||
| -rw-r--r-- | elisp/geiser-impl.el | 4 | ||||
| -rw-r--r-- | elisp/geiser-syntax.el | 4 |
4 files changed, 7 insertions, 6 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-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-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))))) |