Skip to content

Adjust to new tramp regexp in emacs 29 #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matsl merged 2 commits into from
Sep 13, 2022
Merged

Adjust to new tramp regexp in emacs 29 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff34fba
Add test case for hpath:remote-at-p
matsl Sep 12, 2022
4a40a53
Modify regexp based on tramp regexp value
matsl Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2022-09-12 Mats Lidell <matsl@gnu.org>

* hpath.el (hpath:tramp-file-name-regexp): Handle tramp regexp from
different Emacs versions.

* test/hpath-tests.el (hpath:remote-at-p): Add test case for
hpath:remote-at-p.

2022-08-29 Bob Weiner <rsw@gnu.org>

* hbut.el (ebut:key-src): Rename to 'ebut:to-key-src'.
Expand Down
8 changes: 6 additions & 2 deletions hpath.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 1-Nov-91 at 00:44:23
;; Last-Mod: 24-Jul-22 at 01:02:25 by Bob Weiner
;; Last-Mod: 12-Sep-22 at 23:57:39 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
Expand Down Expand Up @@ -724,7 +724,11 @@ Removes bol anchor and removes match to empty string if present."
(tramp-regexp (car (if (fboundp 'tramp-file-name-structure)
(tramp-file-name-structure)
tramp-file-name-structure))))
(substring-no-properties (replace-regexp-in-string "\\\\'" "" tramp-regexp) 1)))
(replace-regexp-in-string
"\\\\'" ""
(cond ((string-match-p "\\\\(\\?:^/\\\\)" tramp-regexp)
(replace-regexp-in-string "\\\\(\\?:\\^/\\\\)" "\\(?:/\\)" tramp-regexp nil t))
(t (substring tramp-regexp 1))))))

(defun hpath:remote-at-p ()
"Return a remote pathname that point is within or nil.
Expand Down
10 changes: 9 additions & 1 deletion test/hpath-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Author: Mats Lidell <matsl@gnu.org>
;;
;; Orig-Date: 28-Feb-21 at 23:26:00
;; Last-Mod: 24-Jul-22 at 10:31:32 by Bob Weiner
;; Last-Mod: 12-Sep-22 at 22:11:14 by Mats Lidell
;;
;; Copyright (C) 2021-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
Expand Down Expand Up @@ -248,5 +248,13 @@
(hy-test-helpers:action-key-should-call-hpath:find (expand-file-name py-file hyperb:dir)))))
(setenv "PYTHONPATH" old-python-path))))

(ert-deftest hpath:remote-at-p ()
"Verify hpath:remote-at-p match a tramp remote file name."
(let ((tramp-file "/ssh:user@host.org:/home/username/file"))
(with-temp-buffer
(insert (concat "\"" tramp-file "\""))
(goto-char 5)
(should (string= (hpath:remote-at-p) tramp-file)))))

(provide 'hpath-tests)
;;; hpath-tests.el ends here