Merge branch 'cairo'.

Main work done by YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>.
Small fixes and image work by Jan D. <jan.h.d@swipnet.se>.

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index a40f8f3d67a..2408ad2d832 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1750,6 +1750,12 @@
 
 2015-02-11  Martin Rudalics  <rudalics@gmx.at>
 
+2015-02-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * version.el (emacs-version): Add cairo version.
+
+2015-02-11  Martin Rudalics  <rudalics@gmx.at>
+
         * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
         Rename frame parameter `maximized' to `fullscreen-restore'.
         Restore fullwidth/-height after fullboth state.  Update doc-strings.
diff --git a/lisp/version.el b/lisp/version.el
index 1837cbf0a85..b8555cbb2f5 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -56,8 +56,8 @@ to the system configuration; look at `system-configuration' instead."
   (interactive "P")
   (let ((version-string
          (format (if (not (called-interactively-p 'interactive))
-                     "GNU Emacs %s (%s%s%s)\n of %s on %s"
-                   "GNU Emacs %s (%s%s%s) of %s on %s")
+                     "GNU Emacs %s (%s%s%s%s)\n of %s on %s"
+                   "GNU Emacs %s (%s%s%s%s) of %s on %s")
                  emacs-version
                  system-configuration
                  (cond ((featurep 'motif)
@@ -68,6 +68,9 @@ to the system configuration; look at `system-configuration' instead."
                        ((featurep 'ns)
                         (format ", NS %s" ns-version-string))
                        (t ""))
+                 (if (featurep 'cairo)
+                     (format ", cairo version %s" cairo-version-string)
+                   "")
                  (if (and (boundp 'x-toolkit-scroll-bars)
                           (memq x-toolkit-scroll-bars '(xaw xaw3d)))
                      (format ", %s scroll bars"