summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2015-09-30 02:40:20 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2015-09-30 02:40:20 +0200
commitdc9be78f1fad878cbc245abce8d331a51ca50fc5 (patch)
tree9d2176686a88e63fa9f4815b338f227e4f55eaba
parent04010556fa1c0043472048516a70044c8850d45d (diff)
downloadgeiser-guile-dc9be78f1fad878cbc245abce8d331a51ca50fc5.tar.gz
geiser-guile-dc9be78f1fad878cbc245abce8d331a51ca50fc5.tar.bz2
Follow suit and complete quoted symbols in all schemes
I kind of dislike completion on symbols, because a quote reads to me as 'stop evaluating', and a symbol per se has infinite possible conversions. But, on the other hand, not completing has no practical advantage, and, moreover, we're already completing symbols inside quoted lists (e.g. try M-TAB next to `'(defi`)), so my prejudices are not even consistent. So here we go!
-rw-r--r--elisp/geiser-chicken.el8
-rw-r--r--elisp/geiser-guile.el4
2 files changed, 7 insertions, 5 deletions
diff --git a/elisp/geiser-chicken.el b/elisp/geiser-chicken.el
index 2a8c082..fc28e63 100644
--- a/elisp/geiser-chicken.el
+++ b/elisp/geiser-chicken.el
@@ -196,11 +196,13 @@ This function uses `geiser-chicken-init-file' if it exists."
'max
(append
(list (save-excursion (beginning-of-line) (point))
- (save-excursion (skip-syntax-backward "^-()>" distance-to-beginning-of-line)
+ (save-excursion (skip-syntax-backward "^'-()>"
+ distance-to-beginning-of-line)
(point)))
(mapcar
(lambda (match-string)
- (save-excursion (skip-chars-backward match-string distance-to-beginning-of-line)
+ (save-excursion (skip-chars-backward match-string
+ distance-to-beginning-of-line)
(point)))
geiser-chicken-prefix-delimiters)))))
@@ -283,7 +285,7 @@ This function uses `geiser-chicken-init-file' if it exists."
(geiser-connect 'chicken))
(defun geiser-chicken--compile-or-load (force-load)
- (let ((target
+ (let ((target
(expand-file-name "chicken/geiser/emacs.so" geiser-scheme-dir))
(source
(expand-file-name "chicken/geiser/emacs.scm" geiser-scheme-dir))
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index f942930..699ed9a 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -1,6 +1,6 @@
;; geiser-guile.el -- guile's implementation of the geiser protocols
-;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Jose Antonio Ortega Ruiz
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the Modified BSD License. You should
@@ -204,7 +204,7 @@ This function uses `geiser-guile-init-file' if it exists."
(if module
(max (save-excursion (beginning-of-line) (point))
(save-excursion (skip-syntax-backward "^(>") (1- (point))))
- (save-excursion (skip-syntax-backward "^-()>") (point))))
+ (save-excursion (skip-syntax-backward "^'-()>") (point))))
;;; Error display