Merge from emacs-24; up to 117634

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 178b23e1fca..4e3b71e3104 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -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)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index d1353bdc8fa..c7394e1cea5 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -531,6 +531,7 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
 	(if viper-mode
 	    ()
 	  (setq viper-mode t)
+          ;; FIXME: Don't reload!
 	  (load-library "viper"))
 
 	(if viper-first-time ; Important check.  Prevents mix-up of startup
@@ -887,6 +888,7 @@ Two differences:
   ;; When viper-mode is executed in such a case, it will set the major mode
   ;; back to fundamental-mode.
   (if (eq (default-value 'major-mode) 'fundamental-mode)
+      ;; FIXME: We should use after-change-major-mode-hook instead!
       (setq-default major-mode 'viper-mode))
 
   (viper-setup-ESC-to-escape t)
@@ -936,6 +938,7 @@ Two differences:
 
   (defadvice self-insert-command (around viper-self-insert-ad activate)
     "Ignore all self-inserting keys in the vi-state."
+    ;; FIXME: Use remapping?
     (if (and (eq viper-current-state 'vi-state)
 	     ;; Do not use called-interactively-p here. XEmacs does not have it
 	     ;; and interactive-p is just fine.