nXhtml

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

  1. fix-emacs24-solaris
  2. Merge into main
Proposed by Ron Parker
Status: Needs review
Proposed branch: lp:~rdparker/nxhtml/fix-emacs24-solaris
Merge into: lp:~nxhtml/nxhtml/main
Diff against target: 13 lines (+3/-1)
1 file modified
nxhtml-base.el (+3/-1)
To merge this branch: bzr merge lp:~rdparker/nxhtml/fix-emacs24-solaris
Reviewer Review Type Date Requested Status
nXhtml Pending
Review via email: mp+110865@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Unmerged revisions

835. By Ron Parker

Only check c:/EmacsW32/ on Windows

Other platforms may interpret it as a TRAMP path. This happened on
OpenIndiana with

GNU Emacs 24.1.1 (i386-pc-solaris2.11, GTK+ Version 2.20.0) of 2012-06-17 on build1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nxhtml-base.el'
2--- nxhtml-base.el 2010-12-28 20:07:18 +0000
3+++ nxhtml-base.el 2012-06-18 17:18:17 +0000
4@@ -50,7 +50,9 @@
5 ;; (version< "2.09beta" "2.08")
6 ;; (version< "2.09beta" "2.09")
7 (defconst nxhtml-menu:version "2.09beta")
8-(when (and t (file-directory-p "c:/EmacsW32/"))
9+(when (and t
10+ (eq 'windows-nt system-type)
11+ (file-directory-p "c:/EmacsW32/"))
12 (setq message-log-max t)
13 (setq debug-on-error t))
14

Subscribers

People subscribed via source and target branches