summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a03b43cfad6..9bc828226d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13 John Paul Wallington <jpw@gnu.org>
+
+ * version.el (emacs-version): Check for `gtk' feature before
+ `x-toolkit' feature.
+
2004-05-13 Juanma Barranquero <lektu@terra.es>
* help-fns.el (help-arg-highlighting-function)
diff --git a/lisp/version.el b/lisp/version.el
index 42dbb3f9c25..d489eeea02e 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -61,9 +61,9 @@ to the system configuration; look at `system-configuration' instead."
system-configuration
(cond ((featurep 'motif)
(concat ", " (substring motif-version-string 4)))
- ((featurep 'x-toolkit) ", X toolkit")
((featurep 'gtk)
(concat ", GTK+ Version " gtk-version-string))
+ ((featurep 'x-toolkit) ", X toolkit")
(t ""))
(if (and (boundp 'x-toolkit-scroll-bars)
(memq x-toolkit-scroll-bars '(xaw xaw3d)))