Merge from emacs--devo--0

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8c03610043dd7db2846ff35d37580a7bc3e1a292..b6464372a41ae0d1b5875ce828805f8ffcddf5d6 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -212,7 +212,7 @@
 (if (eq system-type 'macos)
     (progn
       (load "ls-lisp")))
-(if (eq system-type 'darwin)
+(if (featurep 'mac-carbon)
     (progn
       (load "term/mac-win")))
 (if (fboundp 'atan)    ; preload some constants and