3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index e086f26e8ab..ce131b854f5 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -159,7 +159,7 @@ If nil then it is bound to `delete-backward-char'."
 
 (defvar vip-inhibit-startup-message nil)
 
-(defvar vip-startup-file (convert-standard-filename "~/.vip")
+(defvar vip-startup-file (locate-user-emacs-file "vip" ".vip")
   "Filename used as startup file for vip.")
 
 ;; key bindings
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 3813c304de1..d0c0a4b4019 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1009,9 +1009,9 @@ as a Meta key and any number of multiple escapes are allowed."
 	(inhibit-quit t))
     (if (viper-ESC-event-p event)
 	(progn
-	  ;; Some versions of Emacs (eg., 22.50.8 have a bug, which makes even
-	  ;; a single ESC into ;; a fast keyseq. To guard against this, we
-	  ;; added a check if there are other events as well. Keep the next
+	  ;; Some versions of Emacs (eg., 22.50.8 (?)) have a bug, which makes
+          ;; even a single ESC into a fast keyseq. To guard against this, we
+	  ;; added a check if there are other events as well.  Keep the next
 	  ;; line for the next time the bug reappears, so that will remember to
 	  ;; report it.
 	  ;;(if (and (viper-fast-keysequence-p) unread-command-events)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index df419420bd4..7f432cdc143 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -313,7 +313,7 @@
 (require 'viper-keym)
 
 ;; better be defined before Viper custom group.
-(defvar viper-custom-file-name (convert-standard-filename "~/.viper")
+(defvar viper-custom-file-name (locate-user-emacs-file "viper" ".viper")
   "Viper customization file.
 If set by the user, this must be done _before_ Viper is loaded in `~/.emacs'.")