Skip to content

Commit 9e5893f

Browse files
committed
---
yaml --- r: 106567 b: refs/heads/try c: 813544f h: refs/heads/master i: 106565: 2d1f68f 106563: 06970d1 106559: acd2a0e v: v3
1 parent f6e4e9f commit 9e5893f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
5-
refs/heads/try: a0e54c77612faa9008f95a136ed1674dfcf494ef
5+
refs/heads/try: 813544fd079dea80a1eb6d4ee56f234058d579ac
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libterm/terminfo/searcher.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ pub fn get_dbpath_for_term(term: &str) -> Option<~Path> {
4242
dirs_to_search.push(Path::new(i.to_owned()));
4343
}
4444
},
45-
// Found nothing, use the default paths
46-
// /usr/share/terminfo is the de facto location, but it seems
47-
// Ubuntu puts it in /lib/terminfo
45+
// Found nothing in TERMINFO_DIRS, use the default paths:
46+
// According to /etc/terminfo/README, after looking at
47+
// ~/.terminfo, ncurses will search /etc/terminfo, then
48+
// /lib/terminfo, and eventually /usr/share/terminfo.
4849
None => {
49-
dirs_to_search.push(Path::new("/usr/share/terminfo"));
50+
dirs_to_search.push(Path::new("/etc/terminfo"));
5051
dirs_to_search.push(Path::new("/lib/terminfo"));
52+
dirs_to_search.push(Path::new("/usr/share/terminfo"));
5153
}
5254
}
5355
}

0 commit comments

Comments
 (0)