forked from troter/xyzzy
-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
Fix tag-jump fail to find XTAGS file in upper directory #30
Merged
mumurik
merged 2 commits into
mumurik:master
from
bowbow99:fix-tag-jump-with-XTAGS-in-upper-dir
Mar 17, 2012
Merged
Fix tag-jump fail to find XTAGS file in upper directory #30
mumurik
merged 2 commits into
mumurik:master
from
bowbow99:fix-tag-jump-with-XTAGS-in-upper-dir
Mar 17, 2012
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit b15ef2a. When doing tag-jump, XTAGS file in current directory is checked first. If it contains line like following: #USE ../../ other XTAGS file in upper directory specified by "../../" will be used instead. Function `tags-setup-buffer` is responsible for following "#USE .." line. In the reverted commit, search pattern for "#USE .." line is changed from this: "#USE \\(\\(../\\)+\\)$" to this: "#USE \\(\\(../\\)+[^/]*\\)$" I think the change is intended to allow specify directory other than straight above, like following: #USE ../other-dir but added part "[^/]*" matches newline character (and following lines if there is), which prodeces inappropriate string for directory name and it fail to find XTAGS file, as reported by >>828 at [xyzzy part17]. [xyzzy part17]: http://toro.2ch.net/test/read.cgi/win/1303662374/
ふむ。revertなんだからとりあえずmergeしちゃってもいいですが、southly氏に見てもらいたい所だなぁ。 |
もともと個人的趣味だから入れなくてもいいと指定していたパッチですし、revertでいいんじゃないでしょうか。 repository を修正し忘れていたとはうかつでした。 |
mumurik
added a commit
that referenced
this pull request
Mar 17, 2012
…-dir Fix tag-jump fail to find XTAGS file in upper directory
了解しました。それじゃacceptで。お手数おかけしましたm_ _m |
mumurik
pushed a commit
that referenced
this pull request
Apr 14, 2012
mumurik
pushed a commit
that referenced
this pull request
Apr 14, 2012
mumurik
pushed a commit
that referenced
this pull request
Apr 14, 2012
mumurik
pushed a commit
that referenced
this pull request
May 1, 2012
mumurik
pushed a commit
that referenced
this pull request
May 1, 2012
mumurik
pushed a commit
that referenced
this pull request
May 1, 2012
mumurik
pushed a commit
that referenced
this pull request
May 1, 2012
mumurik
pushed a commit
that referenced
this pull request
May 1, 2012
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2ch で出てたタグジャンプの失敗を修正しました(いや、何もしてませんが)。
タグジャンプは最初にカレントディレクトリにある XTAGS を見て、
#USE ../../
とか書いてあればそのディレクトリの XTAGS を探しに行くんですが、この行を探す regexp を変更した結果改行にもマッチしちゃうようになってディレクトリ名として使えなくなってたようです。