← Back to team overview

nxhtml team mailing list archive

[Merge] lp:~rdparker/nxhtml/fix-emacs24-solaris into lp:nxhtml

 

Ron Parker has proposed merging lp:~rdparker/nxhtml/fix-emacs24-solaris into lp:nxhtml.

Requested reviews:
  nXhtml (nxhtml)

For more details, see:
https://code.launchpad.net/~rdparker/nxhtml/fix-emacs24-solaris/+merge/110865

The debugging code

    (when (and t (file-directory-p "c:/EmacsW32/"))
      (setq message-log-max t)
      (setq debug-on-error t))

near the top of nxhtml-base.el is problematic running Emacs 24.1.1 on OpenIndiana 151a4 (prestable-3).  The c: path is interpreted as a TRAMP path, which times out and then fails to load the package.

This branch checks that the system is running on Windows before performing the file test.
-- 
https://code.launchpad.net/~rdparker/nxhtml/fix-emacs24-solaris/+merge/110865
Your team nXhtml is requested to review the proposed merge of lp:~rdparker/nxhtml/fix-emacs24-solaris into lp:nxhtml.
=== modified file 'nxhtml-base.el'
--- nxhtml-base.el	2010-12-28 20:07:18 +0000
+++ nxhtml-base.el	2012-06-18 17:18:17 +0000
@@ -50,7 +50,9 @@
 ;; (version< "2.09beta" "2.08")
 ;; (version< "2.09beta" "2.09")
 (defconst nxhtml-menu:version "2.09beta")
-(when (and t (file-directory-p "c:/EmacsW32/"))
+(when (and t
+	   (eq 'windows-nt system-type)
+	   (file-directory-p "c:/EmacsW32/"))
   (setq message-log-max t)
   (setq debug-on-error t))