Merge branch 'master' into cairo

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

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 4afa379f389d6625ab633c82988f493c21c5cb8c..59f47525e55dd2f5c8f1add1e15758b23bf20153 100644 (file)
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,6 +1,6 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
-;; Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1997, 1999-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
@@ -984,7 +984,7 @@ Otherwise return the normal value."
 ;; macros, since it enables certain macros to be shared between X and TTY modes
 ;; by correctly mapping key sequences for Left/Right/... (on an ascii
 ;; terminal) into logical keys left, right, etc.
-(defun viper-read-key ()
+(defun viper-read-key () ;; FIXME: Use `read-key'?
   (let ((overriding-local-map viper-overriding-map)
        (inhibit-quit t)
        help-char key)