rename some Emacs files under ~/doc/

3 files changed, 10 insertions, 10 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 21162fbe..d30e76d3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -915,7 +915,7 @@ To be used only when it seems to be necessary."
 (global-set-key "\C-cih" #'add-file-local-variable-prop-line)
 
 ;; don't do anything with abbrevs if ~/doc is not checked out
-(defvar spw/doc-abbrevs-file (expand-file-name "~/doc/emacs-abbrevs"))
+(defvar spw/doc-abbrevs-file (expand-file-name "~/doc/abbrevs"))
 (when (file-exists-p spw/doc-abbrevs-file)
   (setq abbrev-file-name spw/doc-abbrevs-file)
   (quietly-read-abbrev-file)
@@ -926,7 +926,7 @@ To be used only when it seems to be necessary."
   (setf (cadr (assq 'abbrev-mode minor-mode-alist)) nil))
 
 ;; similar
-(defvar spw/doc-bookmarks-file (expand-file-name "~/doc/emacs-bookmarks"))
+(defvar spw/doc-bookmarks-file (expand-file-name "~/doc/bookmarks"))
 (when (file-exists-p spw/doc-bookmarks-file)
   (setq bookmark-default-file spw/doc-bookmarks-file
         bookmark-save-flag 1))
@@ -4810,7 +4810,7 @@ before uploading to NEW again." \n \n
  '(org-adapt-indentation t nil)
 
  '(org-agenda-entry-text-maxlines 3)
- '(org-agenda-files "~/doc/emacs-org-agenda-files")
+ '(org-agenda-files "~/doc/org-agenda-files")
  '(org-agenda-persistent-filter t)
  '(org-agenda-remove-times-when-in-prefix 'beg)
 
@@ -5439,7 +5439,7 @@ different occasions."
 	     (string-to-number day) dayname)))
  '(calendar-date-style 'iso)
  '(calendar-week-start-day 1)
- '(diary-file "~/doc/emacs-diary")
+ '(diary-file "~/doc/diary")
  '(diary-list-entries-hook
    '(diary-include-other-diary-files diary-sort-entries))
  '(diary-mark-entries-hook '(diary-mark-included-diary-files))
@@ -5451,13 +5451,13 @@ different occasions."
 ;; bindings, and for editing purposes just C-x b suffices.
 (global-set-key "\C-cC" #'calendar)
 
-(when (file-readable-p "~/doc/emacs-diary")
+(when (file-readable-p "~/doc/diary")
   (require 'org-agenda)	; for `org-class'
   (unless
       (bound-and-true-p appt-timer)    ; avoid msgs when `eval-buffer' init.el
     (appt-activate 1))
   (add-to-list 'auto-mode-alist
-	       `(,(format "\\`%s\\'" (expand-file-name "~/doc/emacs-diary"))
+	       `(,(format "\\`%s\\'" (expand-file-name "~/doc/diary"))
 		  . diary-mode)))
 
 (defun spw/diary-archive-entry (year)
@@ -5468,7 +5468,7 @@ different occasions."
   (let ((start (point)))
     (forward-line 1)
     (while (looking-at "[[:blank:]]+") (forward-line 1))
-    (append-to-file start (point) (format "~/doc/archive/emacs-diary-%d" year))
+    (append-to-file start (point) (format "~/doc/archive/diary-%d" year))
     (delete-region start (point))
     (when (and (bolp) (eolp)) (delete-blank-lines))))
 (with-eval-after-load 'diary-lib
diff --git a/bin/doccheckin b/bin/doccheckin
index 7c09e819..fe2553e5 100755
--- a/bin/doccheckin
+++ b/bin/doccheckin
@@ -19,8 +19,8 @@ git add howm/*.org howm/*/*.org archive/howm/archive.org \
     papers/*.org papers/*.md papers/*.bib \
     newpapers/*/*.org \
     dissert/*.md pres/*.md letters/*.tex \
-    howm/.howm-keys emacs-abbrevs emacs-bookmarks \
-    News/*.SCORE emacs-diary archive/emacs-diary-* \
+    howm/.howm-keys abbrevs bookmarks \
+    News/*.SCORE diary archive/diary-* \
     || true
 
 # this command should never fail and stop mr
diff --git a/scripts/git/sort-into-yyyy b/scripts/git/sort-into-yyyy
index 46939e91..c3e4be98 100755
--- a/scripts/git/sort-into-yyyy
+++ b/scripts/git/sort-into-yyyy
@@ -6,7 +6,7 @@ use Git::Wrapper;
 
 $git = Git::Wrapper->new(getcwd);
 
-open $fh, "<", "$ENV{HOME}/doc/emacs-org-agenda-files";
+open $fh, "<", "$ENV{HOME}/doc/org-agenda-files";
 for (<$fh>) {
     chomp;
     s{^~/doc/}{};