* lisp/simple.el (prog-mode-map): New var.

[gnu-emacs] / lisp / pgg-parse.el

diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 809a94554ad46dda214449162efbfa724005616d..40df20bde34c5841648fa218547ac007961b9e89 100644 (file)
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -1,7 +1,7 @@
 ;;; pgg-parse.el --- OpenPGP packet parsing
 
 ;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
@@ -503,8 +503,8 @@
 (defun pgg-parse-armor (string)
   (with-temp-buffer
     (buffer-disable-undo)
-    (if (fboundp 'set-buffer-multibyte)
-       (set-buffer-multibyte nil))
+    (unless (featurep 'xemacs)
+      (set-buffer-multibyte nil))
     (insert string)
     (pgg-decode-armor-region (point-min)(point))))