[Emacs-diffs] master d4af2f3: rfc2104.el: Remove XEmacs compat code.

[Lars Ingebrigtsen]

branch: master
commit d4af2f3001fea2d9ea46facaf26d3330bd8626e2
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    rfc2104.el: Remove XEmacs compat code.
    
    * lisp/net/rfc2104.el (rfc2104-string-make-unibyte): Remove XEmacs
      compat code.
---
 lisp/net/rfc2104.el | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lisp/net/rfc2104.el b/lisp/net/rfc2104.el
index 68c35aa..9d4957d 100644
--- a/lisp/net/rfc2104.el
+++ b/lisp/net/rfc2104.el
@@ -84,14 +84,6 @@
       (setq ls (cdr ls)))
     v))
 
-(eval-when-compile
-  (defmacro rfc2104-string-make-unibyte (string)
-    "Return the unibyte equivalent of STRING.
-In XEmacs return just STRING."
-    (if (featurep 'xemacs)
-       string
-      `(string-make-unibyte ,string))))
-
 (defun rfc2104-hash (hash block-length hash-length key text)
   (let* (;; if key is longer than B, reset it to HASH(key)
         (key (if (> (length key) block-length)
@@ -107,7 +99,7 @@ In XEmacs return just STRING."
       (aset ipad i (logxor rfc2104-ipad c))
       (aset opad i (logxor rfc2104-opad c)))
     ;; Perform inner hash.
-    (setq partial (rfc2104-string-make-unibyte
+    (setq partial (string-make-unibyte
                   (funcall hash (concat ipad text))))
     ;; Pack latter part of opad.
     (cl-do ((r 0 (+ 2 r))
@@ -117,7 +109,7 @@ In XEmacs return just STRING."
             (+ (* 16 (aref rfc2104-nybbles (aref partial     r)))
                (      aref rfc2104-nybbles (aref partial (1+ r))))))
     ;; Perform outer hash.
-    (rfc2104-string-make-unibyte (funcall hash opad))))
+    (string-make-unibyte (funcall hash opad))))
 
 (provide 'rfc2104)