bug#18512: 24.3.93; tramp persistency file: incompatible with old versions? Tramp won't start!

[Glenn Morris]

Version: 25.1

David Reitter wrote:

> There are differences in philosophy between GNU Emacs and Aquamacs
> Emacs.

And you get to fix the bugs that result from that! :)
But I applied this:

*** lisp/startup.el     2014-10-02 13:26:23 +0000
--- lisp/startup.el     2014-10-04 18:53:16 +0000
***************
*** 1286,1292 ****
    (let (warned)
      (dolist (dir load-path)
        (and (not warned)
!          (string-match-p "/[._]emacs\\.d/?\\'" dir)
           (string-equal (file-name-as-directory (expand-file-name dir))
                         (expand-file-name user-emacs-directory))
           (setq warned t)
--- 1286,1296 ----
    (let (warned)
      (dolist (dir load-path)
        (and (not warned)
!          (string-match-p
!           (format "/%s/?\\'"
!                   (regexp-quote
!                    (file-name-nondirectory
!                     (directory-file-name user-emacs-directory)))) dir)
           (string-equal (file-name-as-directory (expand-file-name dir))
                         (expand-file-name user-emacs-directory))
           (setq warned t)