---

bors · bors · commit d9df5d2cee8a · 2014-03-02T15:06:34.000-08:00
yaml --- r: 102321 b: refs/heads/master c: 813544f h: refs/heads/master i: 102319: c970c1a v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a0e54c77612faa9008f95a136ed1674dfcf494ef
+refs/heads/master: 813544fd079dea80a1eb6d4ee56f234058d579ac
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff
diff --git a/trunk/src/libterm/terminfo/searcher.rs b/trunk/src/libterm/terminfo/searcher.rs
@@ -42,12 +42,14 @@ pub fn get_dbpath_for_term(term: &str) -> Option<~Path> {
                         dirs_to_search.push(Path::new(i.to_owned()));
                     }
                 },
-                // Found nothing, use the default paths
-                // /usr/share/terminfo is the de facto location, but it seems
-                // Ubuntu puts it in /lib/terminfo
+                // Found nothing in TERMINFO_DIRS, use the default paths:
+                // According to  /etc/terminfo/README, after looking at
+                // ~/.terminfo, ncurses will search /etc/terminfo, then
+                // /lib/terminfo, and eventually /usr/share/terminfo.
                 None => {
-                    dirs_to_search.push(Path::new("/usr/share/terminfo"));
+                    dirs_to_search.push(Path::new("/etc/terminfo"));
                     dirs_to_search.push(Path::new("/lib/terminfo"));
+                    dirs_to_search.push(Path::new("/usr/share/terminfo"));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@ pub fn get_dbpath_for_term(term: &str) -> Option<~Path> {`
`42`	`42`	`dirs_to_search.push(Path::new(i.to_owned()));`
`43`	`43`	`}`
`44`	`44`	`},`
`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.`
`48`	`49`	`None => {`
`49`		`- dirs_to_search.push(Path::new("/usr/share/terminfo"));`
	`50`	`+ dirs_to_search.push(Path::new("/etc/terminfo"));`
`50`	`51`	`dirs_to_search.push(Path::new("/lib/terminfo"));`
	`52`	`+ dirs_to_search.push(Path::new("/usr/share/terminfo"));`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`	`}`