[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/scripts/kde-emacs
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2007-12-06 10:22:18
Message-ID: 1196936538.335899.23284.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 745545 by blackie:

Hmmm my comments about 0 and nil being the same in the previous checking was just plain wrong.
The problem was this:

The emacs type is only decided on compile time of the file. If you ever use
GNU Emacs, then it will compile the file, and it will say emacs. If you
then later uses XEmacs, then it will load the compiled file, and the
variable will claim that you are using GNU Emacs, not XEmacs.

The other way around is not a problem, as GNU Emacs will not load XEmacs
compiled files.

 M  +3 -4      kde-emacs-vars.el  


--- trunk/KDE/kdesdk/scripts/kde-emacs/kde-emacs-vars.el #745544:745545
@@ -28,10 +28,9 @@
 
 
 (defvar kde-emacs-type
-  (eval-when-compile
-    (if (not (eq (string-match "XEmacs" (emacs-version)) nil))
-	'xemacs
-      'emacs))
+  (if (string-match "XEmacs" (emacs-version))
+      'xemacs
+    'emacs)
   "The type of Emacs we are running on.")
 
 ;*---------------------------------------------------------------------*/
[prev in list] [next in list] [prev in thread] [next in thread]