[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/beardbolt 743f9a68ec 158/323: Handle non absolute .file
From: |
ELPA Syncer |
Subject: |
[elpa] externals/beardbolt 743f9a68ec 158/323: Handle non absolute .file paths |
Date: |
Thu, 9 Mar 2023 10:58:27 -0500 (EST) |
branch: externals/beardbolt
commit 743f9a68ec43f3d21fb3107153feefc377d80da3
Author: Jay Kamat <jaygkamat@gmail.com>
Commit: Jay Kamat <jaygkamat@gmail.com>
Handle non absolute .file paths
If we get a non-absolute .file path, treat it as if we are comparing
in the directory of the source file. This should only make a
difference for d, and may break other behavior in that case.
Please report a bug if you encounter such behavior.
---
rmsbolt.el | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/rmsbolt.el b/rmsbolt.el
index e87f47368b..fd85aa5b42 100644
--- a/rmsbolt.el
+++ b/rmsbolt.el
@@ -929,10 +929,12 @@ Argument SRC-BUFFER source buffer."
'("Aborting processing due to exceeding the binary limit.")))
(when (string-match rmsbolt-disass-line line)
;; Don't add linums from files which we aren't inspecting
- (if (file-equal-p src-file-name
- (match-string 1 line))
- (setq source-linum (string-to-number (match-string 2 line)))
- (setq source-linum nil))
+ ;; If we get a non-absolute .file path, treat it like we are in the
src directory.
+ (let ((default-directory (file-name-directory src-file-name)))
+ (if (file-equal-p src-file-name
+ (match-string 1 line))
+ (setq source-linum (string-to-number (match-string 2 line)))
+ (setq source-linum nil)))
;; We are just setting a linum, no data here.
(throw 'continue t))
@@ -984,12 +986,14 @@ Argument SRC-BUFFER source buffer."
;; Process any line number hints
((string-match rmsbolt-source-tag line)
(if (or (not src-file-name) ;; Skip file match if we don't have a
current filename
- (file-equal-p src-file-name
- (gethash
- (string-to-number (match-string 1 line))
- source-file-map
- ;; Assume we never will compile dev null :P
- "/dev/null")))
+ ;; If we get a non-absolute .file path, treat it like we
are in the src directory.
+ (let ((default-directory (file-name-directory
src-file-name)))
+ (file-equal-p src-file-name
+ (gethash
+ (string-to-number (match-string 1 line))
+ source-file-map
+ ;; Assume we never will compile dev null
:P
+ "/dev/null"))))
(setq source-linum (string-to-number
(match-string 2 line)))
(setq source-linum nil)))
- [elpa] externals/beardbolt 1cc069a121 132/323: Quote filenames before passing them as shell arguments, (continued)
- [elpa] externals/beardbolt 1cc069a121 132/323: Quote filenames before passing them as shell arguments, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 495d481a94 136/323: Move rmsbolt-command initialization to end, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 39055a3dc4 133/323: Fix disassembly of partial files in C/C++, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 27e7bb714f 139/323: Add suppport for PHP, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 4b6abc5ef8 129/323: Optimize rmsbolt-process-src-asm-lines, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 67238e0272 138/323: Add rmsbolt-default-directory customization, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 9b2c85397c 149/323: Add texinfo version of docs, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt ec99a1aa31 146/323: Attempt to fix whitespace clearing on hot recompiles, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 5e389a88d9 152/323: Add rmsbolt splitter for splitting and mutating commands, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 0fbc3d3f09 153/323: Enable compile_commands.json parsing for c/cpp, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 743f9a68ec 158/323: Handle non absolute .file paths,
ELPA Syncer <=
- [elpa] externals/beardbolt 609f781b3a 165/323: Fix usages of when-let, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt c9f3b839e9 156/323: Add support for D, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt a4f794666d 160/323: Add D to commentary, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt b7d318dfe1 178/323: Add Swift language support, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 98e984493b 170/323: Prevent hot recompile on deleted buffers, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt c655e2af39 186/323: Add check for dead buffers in compilation finish fn, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt d51e71f894 188/323: Use special named buffer for compilation, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 712981e16c 187/323: Remove langauges godbolt has added support for, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt ff496660cc 205/323: Migrate irc channel to libera, ELPA Syncer, 2023/03/09
- [elpa] externals/beardbolt 42edd955ae 201/323: Move filename massaging out of hot loop, ELPA Syncer, 2023/03/09