[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 01d30bf 28/56: Merge pull request #163 from FelipeLema/mas
From: |
Rocky Bernstein |
Subject: |
[elpa] master 01d30bf 28/56: Merge pull request #163 from FelipeLema/master |
Date: |
Sat, 27 May 2017 05:02:33 -0400 (EDT) |
branch: master
commit 01d30bf5294c55f04a9140222df7ae2be7c53510
Merge: 357c54d 4f57d25
Author: R. Bernstein <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #163 from FelipeLema/master
Customizable "search for this (relative) bp file"
---
realgud/common/file.el | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/realgud/common/file.el b/realgud/common/file.el
index cd27057..3ca1b30 100644
--- a/realgud/common/file.el
+++ b/realgud/common/file.el
@@ -23,11 +23,15 @@
value is associated filesystem string presumably in the
filesystem")
+
(declare-function realgud:strip 'realgud)
(declare-function realgud-loc-goto 'realgud-loc)
(declare-function buffer-killed? 'helper)
(declare-function compilation-find-file 'compile)
+(defcustom realgud-file-find-function 'compilation-find-file
+ "Function to call when we can't easily find file")
+
(defun realgud:file-line-count(filename)
"Return the number of lines in file FILENAME, or nil FILENAME can't be
found"
@@ -76,30 +80,29 @@ problem as best as we can determine."
(unless (and filename (file-readable-p filename))
(if find-file-fn
- (setq filename (funcall find-file-fn filename))
+ (setq filename (funcall find-file-fn filename))
;; FIXME: Remove the below by refactoring to use the above find-file-fn
;; else
(if (and ignore-file-re (string-match ignore-file-re filename))
- (message "tracking ignored for psuedo-file %s" filename)
- ;; else
- (let ((remapped-filename))
- (if (gethash filename realgud-file-remap)
- (progn
- (setq remapped-filename (gethash filename realgud-file-remap))
- (if (file-exists-p remapped-filename)
- (setq filename remapped-filename)
- (remhash filename realgud-file-remap)))
- ;; else
- (progn
- (setq remapped-filename
- (buffer-file-name
- (compilation-find-file (point-marker) filename directory)))
- (when (and remapped-filename (file-exists-p remapped-filename))
- (puthash filename remapped-filename realgud-file-remap)
- (setq filename remapped-filename)
- )
- )))
- )
+ (message "tracking ignored for pseudo-file %s" filename)
+ ;; else
+ (let ((remapped-filename))
+ (if (gethash filename realgud-file-remap)
+ (progn
+ (setq remapped-filename (gethash filename realgud-file-remap))
+ (if (file-exists-p remapped-filename)
+ (setq filename remapped-filename)
+ (remhash filename realgud-file-remap)))
+ ;; else
+ (let ((found-file (funcall realgud-file-find-function
(point-marker) filename directory)))
+ (when found-file
+ (setq remapped-filename (buffer-file-name found-file))
+ (when (and remapped-filename (file-exists-p
remapped-filename))
+ (puthash filename remapped-filename realgud-file-remap)
+ (setq filename remapped-filename)
+ ))
+ )))
+ )
;; FIXME: remove above -----------------------------------.
))
(if filename
- [elpa] master df6921b 37/56: Merge branch 'master' of github.com:realgud/realgud, (continued)
- [elpa] master df6921b 37/56: Merge branch 'master' of github.com:realgud/realgud, Rocky Bernstein, 2017/05/27
- [elpa] master f73b937 39/56: Initalize local-variable realgd:jdb-file-remap, Rocky Bernstein, 2017/05/27
- [elpa] master 392573c 44/56: Merge branch 'master' of github.com:realgud/realgud, Rocky Bernstein, 2017/05/27
- [elpa] master 7915661 42/56: Initalize local-variable realgd:jdb-file-remap, Rocky Bernstein, 2017/05/27
- [elpa] master ea21fd6 22/56: field char-offset -> column, Rocky Bernstein, 2017/05/27
- [elpa] master da5fbd6 46/56: Fix up automake install, Rocky Bernstein, 2017/05/27
- [elpa] master f7012d4 45/56: Small cleanups, Rocky Bernstein, 2017/05/27
- [elpa] master a0af8eb 54/56: Add trepan2-delayed and trepan3k-delayed, Rocky Bernstein, 2017/05/27
- [elpa] master 0220e92 50/56: Merge pull request #175 from Apteryks/patch-1, Rocky Bernstein, 2017/05/27
- [elpa] master 1bfe1e6 49/56: Honor debugger-name in trepan2-suggest-invocation, Rocky Bernstein, 2017/05/27
- [elpa] master 01d30bf 28/56: Merge pull request #163 from FelipeLema/master,
Rocky Bernstein <=
- [elpa] master f4a6f30 36/56: Remove more lint messages, Rocky Bernstein, 2017/05/27
- [elpa] master 2ea1709 24/56: Restor column location..., Rocky Bernstein, 2017/05/27
- [elpa] master 4a5fe99 30/56: Fixes #164, Rocky Bernstein, 2017/05/27
- [elpa] master 44c32b1 11/56: more doc corrections:, Rocky Bernstein, 2017/05/27
- [elpa] master fc422dc 34/56: caddr -> cl-caddr, Rocky Bernstein, 2017/05/27
- [elpa] master f7f4132 21/56: WIP: stab at positioning with column offsets, Rocky Bernstein, 2017/05/27
- [elpa] master 6fe5ba7 38/56: Add jdb termination message, Rocky Bernstein, 2017/05/27
- [elpa] master 2e52d3d 41/56: Add jdb termination message, Rocky Bernstein, 2017/05/27
- [elpa] master e54e79e 40/56: Merge branch 'master' of github.com:realgud/realgud, Rocky Bernstein, 2017/05/27
- [elpa] master a62e72e 47/56: Set EMACSLOADPATH in travis run, Rocky Bernstein, 2017/05/27