X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-version.el;h=1eb46def2b7d6c88305f2cccf3d2abfe159e4a37;hp=eba8b6354c459c1ed5fe364a30d3f061ef04efe9;hb=2d1c8282fe0f45703f23a38ae033766d3256fbde;hpb=1bbf5fceebe20770f13240a7cc24e69ca865d328

diff --git a/lisp/riece-version.el b/lisp/riece-version.el
index eba8b63..1eb46de 100644
--- a/lisp/riece-version.el
+++ b/lisp/riece-version.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -48,14 +48,16 @@ string, be sure to use a valid format, see RFC 2616."
 
 (defconst riece-product-name "Riece")
 
-(defconst riece-version-number "1.0.6"
+(defconst riece-version-number "3.1.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.
@@ -79,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