# HG changeset patch # User Oleksandr Gavenko # Date 1230048268 -7200 # Node ID fcea9d3b79e1d85842ea492d0fe9f13cac3f2c5e # Parent 75b4bf140e733fec75a60a5342e468e4824dcea9 Rename -my{-pre/-post} to {-pre/-post}. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs --- a/.emacs Sun Dec 21 22:12:34 2008 +0200 +++ b/.emacs Tue Dec 23 18:04:28 2008 +0200 @@ -2,7 +2,7 @@ ;; ;; Copyright (C) 2008 by Oleksandr Gavenko ;; -;; ~/.emacs firstly load ~/.emacs-my-pre, then ~/.emacs-my, then ~/.emacs-my-post. +;; ~/.emacs firstly load ~/.emacs-pre, then ~/.emacs-my, then ~/.emacs-post. ;; ====================================================================== ;; Load path. @@ -16,21 +16,21 @@ (add-to-list 'load-path my-el-dir) (add-to-list 'load-path my-usr-el-dir) -(defvar dot-emacs-my-pre (expand-file-name "~/.emacs-my-pre") +(defvar dot-emacs-pre (expand-file-name "~/.emacs-pre") "Path to file with pre-loaded custom settings.") -(defvar dot-emacs-my-post (expand-file-name "~/.emacs-my-post") +(defvar dot-emacs-post (expand-file-name "~/.emacs-post") "Path to file with post-loaded custom settings.") ;; pre-load custom settings -(if (file-exists-p dot-emacs-my-pre) - (load dot-emacs-my-pre)) +(if (file-exists-p dot-emacs-pre) + (load dot-emacs-pre)) ;; load main customization (load "~/.emacs-my") ;; post-load custom settings -(if (file-exists-p dot-emacs-my-post) - (load dot-emacs-my-post)) +(if (file-exists-p dot-emacs-post) + (load dot-emacs-post)) (custom-set-variables ;; custom-set-variables was added by Custom. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs-my --- a/.emacs-my Sun Dec 21 22:12:34 2008 +0200 +++ b/.emacs-my Tue Dec 23 18:04:28 2008 +0200 @@ -4,7 +4,7 @@ ;; ;; .emacs file for GNU Emacs. ;; -;; ~/.emacs load this file after ~/.emacs-my-pre, but before ~/.emacs-my-post. +;; ~/.emacs load this file after ~/.emacs-pre, but before ~/.emacs-post. ;; ====================================================================== ;; Debugging. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs-my-post --- a/.emacs-my-post Sun Dec 21 22:12:34 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -;; -*- lisp -*- -;; Lastly .emacs load this file, after .emacs-my. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs-my-pre --- a/.emacs-my-pre Sun Dec 21 22:12:34 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -;; -*- lisp -*- -;; Firstly .emacs load this file, then .emacs-my. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs-post --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.emacs-post Tue Dec 23 18:04:28 2008 +0200 @@ -0,0 +1,2 @@ +;; -*- lisp -*- +;; Lastly .emacs load this file, after .emacs-my. diff -r 75b4bf140e73 -r fcea9d3b79e1 .emacs-pre --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.emacs-pre Tue Dec 23 18:04:28 2008 +0200 @@ -0,0 +1,2 @@ +;; -*- lisp -*- +;; Firstly .emacs load this file, then .emacs-my. diff -r 75b4bf140e73 -r fcea9d3b79e1 INSTALL --- a/INSTALL Sun Dec 21 22:12:34 2008 +0200 +++ b/INSTALL Tue Dec 23 18:04:28 2008 +0200 @@ -14,11 +14,11 @@ * Организация файлов настроек. -По умолчанию код .emacs загружает файл "$HOME/.emacs-my-pre", затем -"$HOME/.emacs-my", затем "$HOME/.emacs-my-post". +По умолчанию код .emacs загружает файл "$HOME/.emacs-pre", затем +"$HOME/.emacs-my", затем "$HOME/.emacs-post". -".emacs-my" хранит общие настройки для всех инсталяций, файлы ".emacs-my-pre" и -".emacs-my-post" содержат настройки для локальной инсталяции. +".emacs-my" хранит общие настройки для всех инсталяций, файлы ".emacs-pre" и +".emacs-post" содержат настройки для локальной инсталяции. Дополнительные загружаемые модули я решил сохраниять в `$HOME/.el'. @@ -32,8 +32,8 @@ Я решил сохранять файлы настроек в домашнем каталоге основного пользователя, а для других пользователей делать соотведствующие символические ссылки: ln -s /home/other-user/.emacs /home/user/.emacs - ln -s /home/other-user/.emacs-my-pre /home/user/.emacs-my-pre + ln -s /home/other-user/.emacs-pre /home/user/.emacs-pre ln -s /home/other-user/.emacs-my /home/user/.emacs-my - ln -s /home/other-user/.emacs-my-post /home/user/.emacs-my-post + ln -s /home/other-user/.emacs-post /home/user/.emacs-post ln -s /home/other-user/.el /home/sasha/.el diff -r 75b4bf140e73 -r fcea9d3b79e1 Makefile --- a/Makefile Sun Dec 21 22:12:34 2008 +0200 +++ b/Makefile Tue Dec 23 18:04:28 2008 +0200 @@ -8,14 +8,14 @@ all: install -install: .emacs .emacs-my .emacs-my-pre .emacs-my-post - for file in .emacs-my-pre .emacs-my-post; do \ +install: .emacs .emacs-my .emacs-pre .emacs-post + for file in .emacs-pre .emacs-post; do \ if [ ! -f $(HOME)/$$file ]; then cp $$file $(HOME)/$$file; fi; \ done cp .emacs $(HOME)/.emacs cp .emacs-my $(HOME)/.emacs-my -install-all: .emacs .emacs-my .emacs-my-pre .emacs-my-post +install-all: .emacs .emacs-my .emacs-pre .emacs-post for file in $^; do \ cp $$file $(HOME)/$$file; \ done