Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / canlock.el

diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el
index 6ebd53380876994f2fdc7b9ba19e149734f5ba93..27b00da1e22d932c3460f985c454ab52ec30c1d4 100644 (file)
--- a/lisp/gnus/canlock.el
+++ b/lisp/gnus/canlock.el
@@ -1,6 +1,6 @@
 ;;; canlock.el --- functions for Cancel-Lock feature
 
-;; Copyright (C) 1998-1999, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1998-1999, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
@@ -70,13 +70,6 @@ buffer does not look like a news message."
   :type 'boolean
   :group 'canlock)
 
-(eval-when-compile
-  (defmacro canlock-string-as-unibyte (string)
-    "Return a unibyte string with the same individual bytes as STRING."
-    (if (fboundp 'string-as-unibyte)
-       (list 'string-as-unibyte string)
-      string)))
-
 (defun canlock-sha1 (message)
   "Make a SHA-1 digest of MESSAGE as a unibyte string of length 20 bytes."
   (let (sha1-maximum-internal-length)
@@ -97,7 +90,7 @@ buffer does not look like a news message."
      (canlock-sha1
       (concat opad
              (canlock-sha1
-              (concat ipad (canlock-string-as-unibyte message-id))))))))
+              (concat ipad (string-as-unibyte message-id))))))))
 
 (defun canlock-narrow-to-header ()
   "Narrow the buffer to the head of the message."