Merge from emacs-23

[gnu-emacs] / lisp / emulation / viper-util.el

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 81485a0390d2f1ff836a1d9d599fead00283de48..70e5466346d8907ba8d22fd7295ffb3c0fd5236d 100644 (file)
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -4,6 +4,7 @@
 ;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: viper
 
 ;; This file is part of GNU Emacs.
 
@@ -76,7 +77,7 @@
 (defalias 'viper-int-to-char
   (if (featurep 'xemacs) 'int-to-char 'identity))
 (defalias 'viper-get-face
-  (if (featurep 'xemacs) 'get-face 'internal-get-face))
+  (if (featurep 'xemacs) 'get-face 'facep))
 (defalias 'viper-color-defined-p
   (if (featurep 'xemacs) 'valid-color-name-p 'x-color-defined-p))
 (defalias 'viper-iconify