branch: elpa/sesman
commit e4775a2e814e8bffbcdf0ef11a63b0ce0b62e858
Author: Vitalie Spinu <spinu...@gmail.com>
Commit: Vitalie Spinu <spinu...@gmail.com>
Remove sesman--expand-path-maybe
---
sesman.el | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/sesman.el b/sesman.el
index 0810cf3acc..2d962c1fa1 100644
--- a/sesman.el
+++ b/sesman.el
@@ -184,11 +184,6 @@ Can be either a symbol, or a function returning a symbol.")
(capitalize cxt-name)
system))))))
-(defun sesman--expand-path-maybe (obj)
- (if (stringp obj)
- (expand-file-name obj)
- obj))
-
;; FIXME: incorporate `sesman-abbreviate-paths'
(defun sesman--abbrev-path-maybe (obj)
(if (stringp obj)
@@ -768,13 +763,15 @@ context. If CXT-TYPE is non-nil, and CXT-VAL is not
given, retrieve it with
(let* ((ses-name (or (car-safe session)
(error "SESSION must be a headed list")))
(cxt-val (or cxt-val
- (sesman--expand-path-maybe
- (or (if cxt-type
- (sesman-context cxt-type system)
- (let ((cxt (sesman--least-specific-context
system)))
- (setq cxt-type (car cxt))
- (cdr cxt)))
- (error "No local context of type %s" cxt-type)))))
+ (or (if cxt-type
+ (sesman-context cxt-type system)
+ (let ((cxt (sesman--least-specific-context
system)))
+ (setq cxt-type (car cxt))
+ (cdr cxt)))
+ (error "No local context of type %s" cxt-type))))
+ (cxt-val (if (stringp cxt-val)
+ (expand-file-name cxt-val)
+ cxt-val))
(key (cons system ses-name))
(link (list key cxt-type cxt-val)))
(if (member cxt-type sesman-single-link-context-types)
