merged
authorOleksandr Gavenko <gavenkoa@gmail.com>
Thu, 18 Mar 2010 09:45:03 +0200
changeset 355 5d61f5f5c0e7
parent 353 b0997da7a813 (diff)
parent 354 8b03fb0a188d (current diff)
child 356 fd1af7a494de
merged
.emacs-my
--- a/.emacs	Wed Mar 17 10:54:06 2010 +0200
+++ b/.emacs	Thu Mar 18 09:45:03 2010 +0200
@@ -1,10 +1,10 @@
-;; -*- mode: lisp; coding: utf-8 -*-
+;; -*- mode: lisp; coding: utf-8; fill-column: 78 -*-
 ;;
 ;; Written by Oleksandr Gavenko <gavenkoa@gmail.com>, 2008-2010.
 ;;
 ;; This file placed in public domain.
 ;;
-;; For loading order see README.
+;; For load order see README.
 
 ;; ======================================================================
 ;; Load path.
--- a/.emacs-my	Wed Mar 17 10:54:06 2010 +0200
+++ b/.emacs-my	Thu Mar 18 09:45:03 2010 +0200
@@ -1,4 +1,4 @@
-;; -*- mode: lisp; coding: utf-8 -*-
+;; -*- mode: lisp; coding: utf-8; fill-column: 78 -*-
 ;;
 ;; Written by Oleksandr Gavenko <gavenkoa@gmail.com>, 2008-2010.
 ;;
@@ -7,7 +7,7 @@
 ;;
 ;; Config file for GNU Emacs.
 ;;
-;; For loading order see README.
+;; For load order see README.
 
 ;; ======================================================================
 ;; debugging.
@@ -93,7 +93,7 @@
 ;; (setq gnuserv-frame (selected-frame))
 
 (require 'server)
-(when (and (= emacs-major-version 23) (equal window-system 'w32))
+(when (and (= emacs-major-version 23) (= emacs-minor-version 1) (equal window-system 'w32))
   (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows.
 
 (server-start)
@@ -131,6 +131,14 @@
 (setq generic-define-unix-modes t)
 (require 'generic-x)
 
+;; The following commands are usually disabled by default. Enable them...
+(put 'eval-expression  'disabled nil)
+(put 'downcase-region  'disabled nil)
+(put 'upcase-region    'disabled nil)
+(put 'narrow-to-page   'disabled nil)
+(put 'narrow-to-region 'disabled nil)
+(put 'scroll-left      'disabled nil)
+
 ;; ----------------------------------------------------------------------
 ;; switching, creating, selecting buffers.
 
@@ -468,29 +476,19 @@
 ;; discography - variant of BibTeX mode for discographies
 
 ;; ======================================================================
-;; unNOVICEd commands...
-;;
-;; The following commands are usually disabled by default. Enable them...
-
-(put 'eval-expression  'disabled nil)
-(put 'downcase-region  'disabled nil)
-(put 'upcase-region    'disabled nil)
-(put 'narrow-to-page   'disabled nil)
-(put 'narrow-to-region 'disabled nil)
-(put 'scroll-left      'disabled nil)
-
-;; ======================================================================
-;; TEX.
+;; TeX, LaTeX.
 
 (setq tex-run-command "initex")
 
-;; ======================================================================
+;; ----------------------------------------------------------------------
 ;; AUC TeX.
 
 ;(add-hook 'LaTeX-mode-hook 'LaTeX-install-toolbar)
 ;; (setq TeX-parse-self t)             ; Enable parse on load.
 ;; (setq TeX-auto-save t)              ; Enable parse on save.
-;; (setq-default TeX-master nil)       ; Query for master file. Finally, if you often use \include or \input, you should make AUCTEX aware of the multi-file document structure
+;; Query for master file. If you often use \include or \input, you should make AUCTEX aware of the
+;; multi-file document structure.
+(setq-default TeX-master nil)
 
 ;(setq TeX-PDF-mode t)
 ;(setq TeX-interactive-mode t)
@@ -519,7 +517,7 @@
 ;           "texify --tex-opt=--src --run-viewer --clean %s.tex"
 ;           'TeX-run-command nil t))))
 
-;; ======================================================================
+;; ----------------------------------------------------------------------
 ;; Reftex activation (Reftex is included with Emacs 21.1).
 
 ;; (autoload 'reftex-mode     "reftex" "RefTeX Minor Mode" t)
@@ -529,7 +527,7 @@
 ;; (add-hook 'LaTeX-mode-hook 'turn-on-reftex)   ; with AUCTeX LaTeX mode
 ;; (add-hook 'latex-mode-hook 'turn-on-reftex)   ; with Emacs latex mode
 
-;; ======================================================================
+;; ----------------------------------------------------------------------
 ;; PreviewLatex.
 
 ;(load "preview-latex.el" nil t t)
--- a/.emacs-post	Wed Mar 17 10:54:06 2010 +0200
+++ b/.emacs-post	Thu Mar 18 09:45:03 2010 +0200
@@ -1,3 +1,3 @@
-;; -*- mode: lisp; coding: utf-8 -*-
+;; -*- mode: lisp; coding: utf-8; fill-column: 78 -*-
 ;;
-;; For loading order see README.
+;; For load order see README.
--- a/.emacs-pre	Wed Mar 17 10:54:06 2010 +0200
+++ b/.emacs-pre	Thu Mar 18 09:45:03 2010 +0200
@@ -1,6 +1,6 @@
-;; -*- mode: lisp; coding: utf-8 -*-
+;; -*- mode: lisp; coding: utf-8; fill-column: 78 -*-
 ;;
-;; For loading order see README.
+;; For load order see README.
 
 ;; Set frame width and heith. 150x46 for 13pt 1280x800, 150x60 for 13pt 1280x1024.
 ;; (setq my-frame-width 150)
--- a/README	Wed Mar 17 10:54:06 2010 +0200
+++ b/README	Thu Mar 18 09:45:03 2010 +0200
@@ -11,16 +11,18 @@
 
   '~/.emacs-pre'
                 For manually written customisation (usually for updating
-                load-path) which can affect on '.emacs-my'. Don't overridden
-                on installing.
+                load-path) which can affect on '.emacs-my'. Will not be
+                overridden on install.
   '~/.emacs.d/my-lisp/autoload-my.el'
                 For defining autoload function for modes (instead loading all
                 mode files to save startup time). Automatically generated.
+  '~/.emacs-custom.el'
+                For storing customisations by Emacs itself. Some settings from
+                this file can effect on loaded elisp files from .emacs-my.
+                Will not be overridden on install.
   '~/.emacs-my'
                 Here main customisations placed.
   '~/.emacs-post'
-                For storing connection settings and loading modes added to
-                load-path in ~/.emacs-pre. Don't overridden on installing.
-  '~/.emacs-custom.el'
-                For storing customisations by Emacs itself. Don't overridden
-                on installing.
+                For storing connection settings, passwords and enabling modes
+                added to load-path in ~/.emacs-pre. Will not be overridden on
+                install.