[Emacs-diffs] master ec45664 04/18: Remove XEmacs compat code from binhex.el

[Lars Ingebrigtsen]

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

    Remove XEmacs compat code from binhex.el
    
    * lisp/mail/binhex.el (binhex-insert-char): Remove XEmacs compat
    code and made into a function instead of a defalias.
    (binhex-decode-region-internal): Remove XEmacs compat code.
---
 lisp/mail/binhex.el | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lisp/mail/binhex.el b/lisp/mail/binhex.el
index 19fcbaa..1cf50aa 100644
--- a/lisp/mail/binhex.el
+++ b/lisp/mail/binhex.el
@@ -88,16 +88,12 @@ input and write the converted data to its standard output."
        ((boundp 'temporary-file-directory) temporary-file-directory)
        ("/tmp/")))
 
-(eval-and-compile
-  (defalias 'binhex-insert-char
-    (if (featurep 'xemacs)
-       'insert-char
-      (lambda (char &optional count ignored buffer)
-       "Insert COUNT copies of CHARACTER into BUFFER."
-       (if (or (null buffer) (eq buffer (current-buffer)))
-           (insert-char char count)
-         (with-current-buffer buffer
-           (insert-char char count)))))))
+(defun binhex-insert-char (char &optional count ignored buffer)
+  "Insert COUNT copies of CHARACTER into BUFFER."
+  (if (or (null buffer) (eq buffer (current-buffer)))
+      (insert-char char count)
+    (with-current-buffer buffer
+      (insert-char char count))))
 
 (defvar binhex-crc-table
   [0  4129  8258  12387  16516  20645  24774  28903
@@ -224,8 +220,8 @@ If HEADER-ONLY is non-nil only decode header and return 
filename."
          (goto-char start)
          (when (re-search-forward binhex-begin-line end t)
             (setq work-buffer (generate-new-buffer " *binhex-work*"))
-           (unless (featurep 'xemacs)
-             (with-current-buffer work-buffer (set-buffer-multibyte nil)))
+           (with-current-buffer work-buffer
+              (set-buffer-multibyte nil))
            (beginning-of-line)
            (setq bits 0 counter 0)
            (while tmp