aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-05-26 14:23:28 -0700
committerGlenn Morris2012-05-26 14:23:28 -0700
commiteb7afdaddc286b57253cf0cd643b2ea594fb130c (patch)
treee8ad9cb021a21127b91467e8a7057027978ca4ce /src
parent04188bb9ad26b7e79625571fbef39b304449496a (diff)
downloademacs-eb7afdaddc286b57253cf0cd643b2ea594fb130c.tar.gz
emacs-eb7afdaddc286b57253cf0cd643b2ea594fb130c.zip
Don't mess with INFOPATH in ns builds
It's not necessary, and would break if INFOPATH was already set (bug#2791). Ref also http://lists.gnu.org/archive/html/emacs-devel/2009-05/msg00035.html http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg00064.html * lisp/paths.el (Info-default-directory-list): * lisp/info.el (info-initialize): For self-contained NS builds, put the included info/ directory at the front. * src/nsterm.m (ns_init_paths): Don't mess with INFOPATH.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m10
2 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c71ea45dded..bea9b4fbc47 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-05-26 Glenn Morris <rgm@gnu.org>
2
3 * nsterm.m (ns_init_paths): Don't mess with INFOPATH. (Bug#2791)
4
12012-05-26 Eli Zaretskii <eliz@gnu.org> 52012-05-26 Eli Zaretskii <eliz@gnu.org>
2 6
3 Extend mouse support on W32 text-mode console. 7 Extend mouse support on W32 text-mode console.
diff --git a/src/nsterm.m b/src/nsterm.m
index 4b8b2bb4820..8bd2bb283b2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -379,16 +379,6 @@ ns_init_paths (void)
379 setenv ("EMACSDOC", [resourcePath UTF8String], 1); 379 setenv ("EMACSDOC", [resourcePath UTF8String], 1);
380 } 380 }
381 } 381 }
382
383 if (!getenv ("INFOPATH"))
384 {
385 resourcePath = [resourceDir stringByAppendingPathComponent: @"info"];
386 if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])
387 if (isDir)
388 setenv ("INFOPATH", [[resourcePath stringByAppendingString: @":"]
389 UTF8String], 1);
390 /* Note, extra colon needed to cause merge w/later user additions. */
391 }
392} 382}
393 383
394 384