summaryrefslogtreecommitdiff
path: root/elisp
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-11 16:28:52 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2010-11-11 16:28:52 +0100
commit69a6b57ba2ef38b409060264e33994a1deffc364 (patch)
tree0c384acdbca168ef7224d375d41c4d95a018e7a7 /elisp
parentea8a2b3762f54ad2f6434b82a80d04228b478d1d (diff)
parent2241711276c6d1b34eeed435009b4684ec8e64ce (diff)
downloadgeiser-69a6b57ba2ef38b409060264e33994a1deffc364.tar.gz
geiser-69a6b57ba2ef38b409060264e33994a1deffc364.tar.bz2
Merge branch 'guile-meta' into meta-reconnection
Diffstat (limited to 'elisp')
-rw-r--r--elisp/geiser-edit.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 4d61edc..8c34c28 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -205,10 +205,12 @@ With prefix, asks for the symbol to edit."
(geiser-completion--read-symbol "Edit symbol: ")))
(cmd `(:eval (:ge symbol-location ',symbol)))
(marker (point-marker)))
- (condition-case nil
+ (condition-case err
(progn (geiser-edit--try-edit symbol (geiser-eval--send/wait cmd))
(when marker (ring-insert find-tag-marker-ring marker)))
- (error (geiser-edit-module-at-point)))))
+ (error (condition-case nil
+ (geiser-edit-module-at-point)
+ (error (error (error-message-string err))))))))
(defun geiser-pop-symbol-stack ()
"Pop back to where \\[geiser-edit-symbol-at-point] was last invoked."