From aae6c37c5eeeb3f276c5aa48a4704fc5b1624b2f Mon Sep 17 00:00:00 2001
From: Sean O'Rourke <seano@cs.ucla.edu>
Date: Sun, 22 Nov 2009 15:03:44 -0700
Subject: [PATCH]

---
 ChangeLog    | 6 ++++++
 lib/Sepia.pm | 2 +-
 sepia.el     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83e1449..a39c752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-22  Sean O'Rourke  <seano@cs.ucla.edu>
+
+	* lib/Sepia.pm (location): handle special @INC entries.
+	* sepia.el (sepia-describe-object): Guess identifier-at-point in
+	the right order.
+
 2009-11-18  Sean O'Rourke  <seano@cs.ucla.edu>
 
 	* sepia.el (sepia-describe-object): new function like
diff --git a/lib/Sepia.pm b/lib/Sepia.pm
index 6d686f7..8895ea0 100644
--- a/lib/Sepia.pm
+++ b/lib/Sepia.pm
@@ -360,7 +360,7 @@ sub location
                     my ($file, $line) = ($cv->file, $cv->line);
                     if ($file !~ /^\//) {
                         for (@INC) {
-                            if (-f "$_/$file") {
+                            if (!ref $_ && -f "$_/$file") {
                                 $file = "$_/$file";
                                 last;
                             }
diff --git a/sepia.el b/sepia.el
index 9d129d0..0da0377 100644
--- a/sepia.el
+++ b/sepia.el
@@ -1529,8 +1529,8 @@ used for eldoc feedback."
 (defun sepia-describe-object (thing)
   "Display documentation for `thing', like ``describe-function'' for elisp."
   (interactive
-   (or (cdr (sepia-ident-before-point))
-       (sepia-ident-at-point)))
+   (or (cdr (sepia-ident-at-point))
+       (cdr (sepia-ident-before-point))))
   (cond
    ((gethash thing sepia-perl-builtins)
     (with-current-buffer (get-buffer-create "*sepia-help*")
-- 
2.11.4.GIT