diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-11 22:08:21 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-11 22:08:21 -0400 |
| commit | 940e5099142a1bb60e76ae2cbd1f47244cb2eb44 (patch) | |
| tree | 31e8ce32a3bc7f2de7040584db2faab8f35436e3 /lisp/emulation | |
| parent | cc72580827719a5012d4ac703c09f92e721f61de (diff) | |
| download | emacs-940e5099142a1bb60e76ae2cbd1f47244cb2eb44.tar.gz | |
Use locate-user-emacs-file.
* lisp/type-break.el (type-break-file-name):
* lisp/textmodes/remember.el (remember-data-file):
* lisp/strokes.el (strokes-file):
* lisp/shadowfile.el (shadow-initialize):
* lisp/saveplace.el (save-place-file):
* lisp/ps-bdf.el (bdf-cache-file):
* lisp/progmodes/idlwave.el (idlwave-config-directory):
* lisp/net/quickurl.el (quickurl-url-file):
* lisp/international/kkc.el (kkc-init-file-name):
* lisp/ido.el (ido-save-directory-list-file):
* lisp/emulation/viper.el (viper-custom-file-name):
* lisp/emulation/vip.el (vip-startup-file):
* lisp/calendar/todo-mode.el (todo-file-do, todo-file-done, todo-file-top):
* lisp/calendar/timeclock.el (timeclock-file): Use locate-user-emacs-file.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/vip.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 6 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 2 |
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'.") |