X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-version.el;h=d0660dfb0be943880da49a1a155fee2fa0341781;hp=8451e191becc3e606d3f3574c29be2c7d7fa63b2;hb=bd1212ce353e60fbe0bd93c66e70e4758c9dbd6f;hpb=7f184fe624ee31ace18f3555f8684b586ca1f70d

diff --git a/lisp/riece-version.el b/lisp/riece-version.el
index 8451e19..d0660df 100644
--- a/lisp/riece-version.el
+++ b/lisp/riece-version.el
@@ -48,19 +48,20 @@ string, be sure to use a valid format, see RFC 2616."
 
 (defconst riece-product-name "Riece")
 
-(defconst riece-version-number "0.1.2"
+(defconst riece-version-number "2.0.0"
   "Version number for this version of Riece.")
 
 (defconst riece-version (format "Riece v%s" riece-version-number)
   "Version string for this version of Riece.")
 
 (eval-when-compile
-  (defvar xemacs-codename))
+  (defvar emacs-program-version)
+  (defvar xemacs-codename)
+  (defvar sxemacs-codename))
 
 (defun riece-extended-version ()
   "Stringified Riece version and Emacs version.
 See the variable `riece-user-agent'."
-  (interactive)
   (let* ((riece-v
 	  (concat riece-product-name "/"
 		  (prin1-to-string riece-version-number t)))
@@ -80,22 +81,20 @@ See the variable `riece-user-agent'."
 		    (if system-v
 			(concat " (" system-v ")")
 		      "")))
-	   ((string-match
-	     "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
-	     emacs-version)
-	    (concat
-	     (match-string 1 emacs-version)
-	     (format "/%d.%d" emacs-major-version emacs-minor-version)
-	     (if (match-beginning 3)
-		 (match-string 3 emacs-version)
-	       "")
-	     (if (boundp 'xemacs-codename)
-		 (concat
-		  " (" xemacs-codename
-		  (if system-v
-		      (concat ", " system-v ")")
-		    ")"))
-	       "")))
+	   ((featurep 'sxemacs)
+	    (concat "SXEmacs/" emacs-program-version
+		    (when system-v
+		      (concat " ("
+			      (when sxemacs-codename
+				(concat sxemacs-codename ", "))
+			      system-v ")"))))
+	   ((featurep 'xemacs)
+	    (concat "XEmacs/" emacs-program-version
+		    (when system-v
+		      (concat " ("
+			      (when xemacs-codename
+				(concat xemacs-codename ", "))
+			      system-v ")"))))
 	   (t emacs-version))))
     (if (stringp riece-user-agent)
 	riece-user-agent
@@ -103,6 +102,14 @@ See the variable `riece-user-agent'."
 	      (when emacs-v
 		(concat " " emacs-v))))))
 
+(defun riece-version (&optional arg)
+  "Version number of this version of Riece.
+If ARG, use user-agent format."
+  (interactive "P")
+  (if arg
+      (message "%s" (riece-extended-version))
+    (message "%s" riece-version)))
+
 (provide 'riece-version)
 
 ;;; riece-version.el ends here