From eb7afdaddc286b57253cf0cd643b2ea594fb130c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 26 May 2012 14:23:28 -0700 Subject: 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. --- src/ChangeLog | 4 ++++ src/nsterm.m | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index c71ea45dded..bea9b4fbc47 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-26 Glenn Morris + + * nsterm.m (ns_init_paths): Don't mess with INFOPATH. (Bug#2791) + 2012-05-26 Eli Zaretskii 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) setenv ("EMACSDOC", [resourcePath UTF8String], 1); } } - - if (!getenv ("INFOPATH")) - { - resourcePath = [resourceDir stringByAppendingPathComponent: @"info"]; - if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir]) - if (isDir) - setenv ("INFOPATH", [[resourcePath stringByAppendingString: @":"] - UTF8String], 1); - /* Note, extra colon needed to cause merge w/later user additions. */ - } } -- cgit v1.2.1