[Emacs-diffs] /srv/bzr/emacs/trunk r108381: Don't mess with INFOPATH in ns builds

[Glenn Morris]

------------------------------------------------------------
revno: 108381
fixes bug: http://debbugs.gnu.org/2791
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-26 14:23:28 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/info.el
  lisp/paths.el
  src/ChangeLog
  src/nsterm.m

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-26 21:17:06 +0000
+++ b/lisp/ChangeLog    2012-05-26 21:23:28 +0000
@@ -1,5 +1,9 @@
 2012-05-26  Glenn Morris  <address@hidden>
 
+       * paths.el (Info-default-directory-list):
+       * info.el (info-initialize): For self-contained NS builds, put the
+       included info/ directory at the front.  (Bug#2791)
+
        * paths.el (Info-default-directory-list): Make it a defcustom,
        mainly so that we can use custom-initialize-delay.
 

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2012-05-22 03:31:34 +0000
+++ b/lisp/info.el      2012-05-26 21:23:28 +0000
@@ -618,7 +618,19 @@
                     (append (split-string (substring path 0 -1) sep)
                             (Info-default-dirs))
                   (split-string path sep))
-              (Info-default-dirs)))))))
+              (Info-default-dirs))))
+      ;; For a self-contained (ie relocatable) NS build, AFAICS we
+      ;; always want the included info directory to be at the head of
+      ;; the search path, unless it's already in INFOPATH somewhere.
+      ;; It's at the head of Info-default-directory-list,
+      ;; but there's no way to get it at the head of Info-directory-list
+      ;; except by doing it here.
+      (and path
+          (featurep 'ns)
+          (let ((dir (expand-file-name "../info" data-directory)))
+            (and (file-directory-p dir)
+                 (not (member dir (split-string path ":" t)))
+                 (push dir Info-directory-list)))))))
 
 ;;;###autoload
 (defun info-other-window (&optional file-or-node)

=== modified file 'lisp/paths.el'
--- a/lisp/paths.el     2012-05-26 21:17:06 +0000
+++ b/lisp/paths.el     2012-05-26 21:23:28 +0000
@@ -37,7 +37,12 @@
 ;; call custom-initialize-delay on it.
 (defcustom Info-default-directory-list
   (let* ((config-dir
-         (file-name-as-directory configure-info-directory))
+         (file-name-as-directory
+          ;; Self-contained NS build with info/ in the app-bundle.
+          (or (and (featurep 'ns)
+                   (let ((dir (expand-file-name "../info" data-directory)))
+                     (if (file-directory-p dir) dir)))
+              configure-info-directory)))
         (prefixes
          ;; Directory trees in which to look for info subdirectories
          (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-26 12:14:56 +0000
+++ b/src/ChangeLog     2012-05-26 21:23:28 +0000
@@ -1,3 +1,7 @@
+2012-05-26  Glenn Morris  <address@hidden>
+
+       * nsterm.m (ns_init_paths): Don't mess with INFOPATH.  (Bug#2791)
+
 2012-05-26  Eli Zaretskii  <address@hidden>
 
        Extend mouse support on W32 text-mode console.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-05-14 16:33:11 +0000
+++ b/src/nsterm.m      2012-05-26 21:23:28 +0000
@@ -379,16 +379,6 @@
             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. */
-    }
 }