[Emacs-diffs] /srv/bzr/emacs/trunk r112018: Use locate-user-emacs-file.

[Stefan Monnier]

------------------------------------------------------------
revno: 112018
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-11 22:08:21 -0400
message:
  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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/calendar/timeclock.el
  lisp/calendar/todo-mode.el
  lisp/emulation/vip.el
  lisp/emulation/viper-cmd.el
  lisp/emulation/viper.el
  lisp/ido.el
  lisp/international/kkc.el
  lisp/net/quickurl.el
  lisp/progmodes/idlwave.el
  lisp/ps-bdf.el
  lisp/saveplace.el
  lisp/shadowfile.el
  lisp/strokes.el
  lisp/textmodes/remember.el
  lisp/type-break.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-03-11 20:37:00 +0000
+++ b/etc/NEWS  2013-03-12 02:08:21 +0000
@@ -85,7 +85,25 @@
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
-** Recentf looks for ~/.emacs.d/recentf additionally to ~/.recentf.
+** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
+Affected files:
+~/.emacs.d/timelog     replaces  ~/.timelog
+~/.emacs.d/todo-do     replaces  ~/.todo-do
+~/.emacs.d/todo-done   replaces  ~/.todo-done
+~/.emacs.d/todo-top    replaces  ~/.todo-top
+~/.emacs.d/vip         replaces  ~/.vip
+~/.emacs.d/viper       replaces  ~/.viper
+~/.emacs.d/ido.last    replaces  ~/.ido.last
+~/.emacs.d/kkcrc       replaces  ~/.kkcrc
+~/.emacs.d/quickurls   replaces  ~/.quickurls
+~/.emacs.d/idlwave     replaces  ~/.idlwave
+~/.emacs.d/bdfcache.el replaces  ~/.bdfcache.el
+~/.emacs.d/places      replaces  ~/.emacs-places
+~/.emacs.d/shadows     replaces  ~/.shadows
+~/.emacs.d/shadow_todo replaces  ~/.shadow_todo
+~/.emacs.d/strokes     replaces  ~/.strokes
+~/.emacs.d/notes       replaces  ~/.notes
+~/.emacs.d/type-break  replaces  ~/.type-break
 
 ** Delphi mode is now called OPascal mode.
 *** All delphi-* variables and functions have been renamed to opascal-*.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-12 01:14:08 +0000
+++ b/lisp/ChangeLog    2013-03-12 02:08:21 +0000
@@ -1,3 +1,20 @@
+2013-03-12  Stefan Monnier  <address@hidden>
+
+       * type-break.el (type-break-file-name):
+       * textmodes/remember.el (remember-data-file):
+       * strokes.el (strokes-file):
+       * shadowfile.el (shadow-initialize):
+       * saveplace.el (save-place-file):
+       * ps-bdf.el (bdf-cache-file):
+       * progmodes/idlwave.el (idlwave-config-directory):
+       * net/quickurl.el (quickurl-url-file):
+       * international/kkc.el (kkc-init-file-name):
+       * ido.el (ido-save-directory-list-file):
+       * emulation/viper.el (viper-custom-file-name):
+       * emulation/vip.el (vip-startup-file):
+       * calendar/todo-mode.el (todo-file-do, todo-file-done, todo-file-top):
+       * calendar/timeclock.el (timeclock-file): Use locate-user-emacs-file.
+
 2013-03-12  Paul Eggert  <address@hidden>
 
        Switch encodings of tutorials, thai-word to UTF-8 (Bug#13880).

=== modified file 'lisp/calendar/timeclock.el'
--- a/lisp/calendar/timeclock.el        2013-01-01 09:11:05 +0000
+++ b/lisp/calendar/timeclock.el        2013-03-12 02:08:21 +0000
@@ -81,7 +81,7 @@
 
 ;;; User Variables:
 
-(defcustom timeclock-file (convert-standard-filename "~/.timelog")
+(defcustom timeclock-file (locate-user-emacs-file "timelog" ".timelog")
   "The file used to store timeclock data in."
   :type 'file
   :group 'timeclock)

=== modified file 'lisp/calendar/todo-mode.el'
--- a/lisp/calendar/todo-mode.el        2013-01-01 09:11:05 +0000
+++ b/lisp/calendar/todo-mode.el        2013-03-12 02:08:21 +0000
@@ -281,11 +281,11 @@
 the diary file somewhat."
   :type 'string
   :group 'todo)
-(defcustom todo-file-do    (convert-standard-filename "~/.todo-do")
+(defcustom todo-file-do    (locate-user-emacs-file "todo-do" ".todo-do")
   "TODO mode list file."
   :type 'file
   :group 'todo)
-(defcustom todo-file-done  (convert-standard-filename "~/.todo-done")
+(defcustom todo-file-done  (locate-user-emacs-file "todo-done" ".todo-done")
   "TODO mode archive file."
   :type 'file
   :group 'todo)
@@ -315,7 +315,7 @@
   :group 'todo)
 (defvar todo-edit-buffer " *TODO Edit*"
   "TODO Edit buffer name.")
-(defcustom todo-file-top (convert-standard-filename "~/.todo-top")
+(defcustom todo-file-top (locate-user-emacs-file "todo-top" ".todo-top")
   "TODO mode top priorities file.
 
 Not in TODO format, but diary compatible.

=== modified file 'lisp/emulation/vip.el'
--- a/lisp/emulation/vip.el     2013-02-12 04:46:18 +0000
+++ b/lisp/emulation/vip.el     2013-03-12 02:08:21 +0000
@@ -159,7 +159,7 @@
 
 (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

=== modified file 'lisp/emulation/viper-cmd.el'
--- a/lisp/emulation/viper-cmd.el       2013-02-23 21:54:00 +0000
+++ b/lisp/emulation/viper-cmd.el       2013-03-12 02:08:21 +0000
@@ -1009,9 +1009,9 @@
        (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)

=== modified file 'lisp/emulation/viper.el'
--- a/lisp/emulation/viper.el   2013-01-01 09:11:05 +0000
+++ b/lisp/emulation/viper.el   2013-03-12 02:08:21 +0000
@@ -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'.")
 

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2013-02-15 19:19:29 +0000
+++ b/lisp/ido.el       2013-03-12 02:08:21 +0000
@@ -927,7 +927,8 @@
   :type 'hook
   :group 'ido)
 
-(defcustom ido-save-directory-list-file (convert-standard-filename 
"~/.ido.last")
+(defcustom ido-save-directory-list-file
+  (locate-user-emacs-file "ido.last" ".ido.last")
   "File in which the ido state is saved between invocations.
 Variables stored are: `ido-last-directory-list', `ido-work-directory-list',
 `ido-work-file-list', and `ido-dir-file-cache'.

=== modified file 'lisp/international/kkc.el'
--- a/lisp/international/kkc.el 2013-01-01 09:11:05 +0000
+++ b/lisp/international/kkc.el 2013-03-12 02:08:21 +0000
@@ -40,7 +40,7 @@
   "String denoting KKC input method.
 This string is shown at mode line when users are in KKC mode.")
 
-(defvar kkc-init-file-name (convert-standard-filename "~/.kkcrc")
+(defvar kkc-init-file-name (locate-user-emacs-file "kkcrc" ".kkcrc")
   "Name of a file which contains user's initial setup code for KKC.")
 
 ;; A flag to control a file specified by `kkc-init-file-name'.

=== modified file 'lisp/net/quickurl.el'
--- a/lisp/net/quickurl.el      2013-02-14 07:50:57 +0000
+++ b/lisp/net/quickurl.el      2013-03-12 02:08:21 +0000
@@ -94,7 +94,8 @@
   :group  'abbrev
   :prefix "quickurl-")
 
-(defcustom quickurl-url-file (convert-standard-filename "~/.quickurls")
+(defcustom quickurl-url-file
+  (locate-user-emacs-file "quickurls" ".quickurls")
   "File that contains the URL list."
   :type  'file
   :group 'quickurl)

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/idlwave.el 2013-03-12 02:08:21 +0000
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;; IDLWAVE enables feature-rich development and interaction with IDL,
-;; the Interactive Data Language. It provides a compelling,
+;; the Interactive Data Language.  It provides a compelling,
 ;; full-featured alternative to the IDLDE development environment
 ;; bundled with IDL.
 
@@ -447,7 +447,7 @@
 
 ;; Configuration files
 (defcustom idlwave-config-directory
-  (convert-standard-filename "~/.idlwave")
+  (locate-user-emacs-file "idlwave" ".idlwave")
   "Directory for configuration files and user-library catalog."
   :group 'idlwave-routine-info
   :type 'file)

=== modified file 'lisp/ps-bdf.el'
--- a/lisp/ps-bdf.el    2013-01-01 09:11:05 +0000
+++ b/lisp/ps-bdf.el    2013-03-12 02:08:21 +0000
@@ -91,12 +91,7 @@
           (insert-file-contents bdfname)
           buf))))
 
-(defvar bdf-cache-file (if (eq system-type 'ms-dos)
-                          ;; convert-standard-filename doesn't
-                          ;; guarantee that the .el extension will be
-                          ;; preserved.
-                          "~/_bdfcache.el"
-                        (convert-standard-filename "~/.bdfcache.el"))
+(defvar bdf-cache-file (locate-user-emacs-file "bdfcache.el" ".bdfcache.el")
   "Name of cache file which contains information of `BDF' font files.")
 
 (defvar bdf-cache nil

=== modified file 'lisp/saveplace.el'
--- a/lisp/saveplace.el 2013-01-01 09:11:05 +0000
+++ b/lisp/saveplace.el 2013-03-12 02:08:21 +0000
@@ -68,7 +68,7 @@
 
 (make-variable-buffer-local 'save-place)
 
-(defcustom save-place-file (convert-standard-filename "~/.emacs-places")
+(defcustom save-place-file (locate-user-emacs-file "places" ".emacs-places")
   "Name of the file that records `save-place-alist' value."
   :type 'file
   :group 'save-place)

=== modified file 'lisp/shadowfile.el'
--- a/lisp/shadowfile.el        2013-01-01 09:11:05 +0000
+++ b/lisp/shadowfile.el        2013-03-12 02:08:21 +0000
@@ -651,7 +651,7 @@
        (beep)
        (sit-for 3)
        nil)
-    (save-excursion
+    (save-current-buffer
       (when shadow-info-file
        (set-buffer (setq shadow-info-buffer
                          (find-file-noselect shadow-info-file)))
@@ -683,7 +683,7 @@
 defined, the old hashtable info is invalid."
   (shadow-invalidate-hashtable)
   (if shadow-info-file
-      (save-excursion
+      (save-current-buffer
        (if (not shadow-info-buffer)
            (setq shadow-info-buffer (find-file-noselect shadow-info-file)))
        (set-buffer shadow-info-buffer)
@@ -802,11 +802,13 @@
            (file-name-as-directory (shadow-expand-file-name "~"))))
   (if (null shadow-info-file)
       (setq shadow-info-file
-           (shadow-expand-file-name (convert-standard-filename "~/.shadows"))))
+            ;; FIXME: Move defaults to their defcustom.
+           (shadow-expand-file-name
+             (locate-user-emacs-file "shadows" ".shadows"))))
   (if (null shadow-todo-file)
       (setq shadow-todo-file
            (shadow-expand-file-name
-            (convert-standard-filename "~/.shadow_todo"))))
+            (locate-user-emacs-file "shadow_todo" ".shadow_todo"))))
   (if (not (shadow-read-files))
       (progn
        (message "Shadowfile information files not found - aborting")

=== modified file 'lisp/strokes.el'
--- a/lisp/strokes.el   2013-01-01 09:11:05 +0000
+++ b/lisp/strokes.el   2013-03-12 02:08:21 +0000
@@ -260,7 +260,7 @@
   :type 'integer
   :group 'strokes)
 
-(defcustom strokes-file (convert-standard-filename "~/.strokes")
+(defcustom strokes-file (locate-user-emacs-file "strokes" ".strokes")
   "File containing saved strokes for Strokes mode (default is ~/.strokes)."
   :type 'file
   :group 'strokes)

=== modified file 'lisp/textmodes/remember.el'
--- a/lisp/textmodes/remember.el        2013-01-31 17:03:53 +0000
+++ b/lisp/textmodes/remember.el        2013-03-12 02:08:21 +0000
@@ -380,7 +380,7 @@
 
 ;; Remembering to plain files
 
-(defcustom remember-data-file (convert-standard-filename "~/.notes")
+(defcustom remember-data-file (locate-user-emacs-file "notes" ".notes")
   "The file in which to store unprocessed data."
   :type 'file
   :group 'remember)

=== modified file 'lisp/type-break.el'
--- a/lisp/type-break.el        2013-01-01 09:11:05 +0000
+++ b/lisp/type-break.el        2013-03-12 02:08:21 +0000
@@ -204,11 +204,11 @@
   :type 'boolean
   :group 'type-break)
 
-(defcustom type-break-file-name (convert-standard-filename "~/.type-break")
+(defcustom type-break-file-name
+  (locate-user-emacs-file "type-break" ".type-break")
   "Name of file used to save state across sessions.
 If this is nil, no data will be saved across sessions."
-  :type 'file
-  :group 'type-break)
+  :type 'file)
 
 (defvar type-break-post-command-hook '(type-break-check)
   "Hook run indirectly by `post-command-hook' for typing break functions.