--- a/.emacs-my Tue Oct 30 18:42:39 2012 +0200
+++ b/.emacs-my Tue Oct 30 19:27:08 2012 +0200
@@ -779,13 +779,13 @@
(setq my-yas-root-directory "~/.emacs.d/my-yas")
(setq yas/ignore-filenames-as-triggers t)
-(eval-after-load 'yasnippet
- '(progn
- (cond
- ((listp yas/root-directory) (add-to-list 'yas/root-directory my-yas-root-directory))
- ((stringp yas/root-directory) (setq yas/root-directory (list my-yas-root-directory yas/root-directory)))
- (t (error "I expect that yas/root-directory is a list of string")) )
- (mapc 'yas/load-directory yas/root-directory)))
+;; (eval-after-load 'yasnippet
+;; '(progn
+;; (cond
+;; ((listp yas/root-directory) (add-to-list 'yas/root-directory my-yas-root-directory))
+;; ((stringp yas/root-directory) (setq yas/root-directory (list my-yas-root-directory yas/root-directory)))
+;; (t (error "I expect that yas/root-directory is a list of string")) )
+;; (mapc 'yas/load-directory yas/root-directory)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "open file, ffap, dired")
@@ -1139,6 +1139,35 @@
))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "info-lookup")
+
+;; Info index nodes for automake under Debian.
+(setq my-fix-for-automake-info-lookup
+ '(("(automake-1.11)Macro Index" nil
+ "^`" "['(]")
+ ("(automake-1.11)Variable Index" nil
+ "^`" "['(]")
+ ("(automake-1.11)General Index" nil
+ "^`" "['(]")))
+
+;; Add `my-fix-for-automake-info-lookup' entries to the end of doc-spec for
+;; some modes.
+(eval-after-load 'info-look
+ '(progn
+ (mapc
+ (lambda (mode)
+ (let ( (doc-spec (info-lookup->doc-spec 'symbol mode)) )
+ (mapc
+ (lambda (doc-spec-item)
+ (setcdr (last doc-spec) (list doc-spec-item)))
+ my-fix-for-automake-info-lookup)))
+ '(makefile-mode autoconf-mode))
+ (info-lookup-maybe-add-help
+ :mode 'makefile-gmake-mode
+ :other-modes '(makefile-mode))
+ ))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "man, woman")
;; Assume that cygwin-mount already activated.
@@ -1423,7 +1452,7 @@
smime-certificate-directory "~/.gnus/certs/"
nnfolder-directory "~/.gnus/archive"
nnfolder-active-file "~/.gnus/archive/active"
-)
+ )
;; Remove gnus-ignored-newsgroups to show all GMail folders.
(setq gnus-ignored-newsgroups "some-non-existing")
@@ -1807,6 +1836,53 @@
;; (setq erc-kill-server-buffer-on-quit t)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "devel, programming")
+
+(which-func-mode 1)
+
+(add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
+
+(defun my-c++-header-file-p ()
+ "Return non-nil, if in a C++ header."
+ (and (string-match "\\.h$"
+ (or (buffer-file-name)
+ (buffer-name)))
+ (save-excursion
+ (re-search-forward "\\_<class\\_>" nil t))))
+
+(when (>= emacs-major-version 22)
+ (add-to-list 'magic-mode-alist '(my-c++-header-file-p . c++-mode))
+ )
+
+(setq-default comment-style (quote indent))
+(setq-default comment-column 44)
+(setq-default comment-fill-column my-fill-column)
+
+(mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) ))
+ (append my-devel-mode-hook-list my-text-mode-hook-list))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(message "diff, patch, ediff, emerge")
+
+(setq diff-switches "-u")
+
+(setq ediff-diff-options "")
+(setq ediff-custom-diff-options "-u")
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+(setq ediff-split-window-function 'split-window-vertically)
+
+(defun my-diff-auto-refine-mode-on () (diff-auto-refine-mode 1))
+(add-hook 'diff-mode-hook 'my-diff-auto-refine-mode-on)
+
+(when window-system
+ (eval-after-load 'diff-mode
+ '(progn
+ (set-face-foreground 'diff-added-face "DarkGreen")
+ (set-face-foreground 'diff-removed-face "DarkRed")
+ (set-face-background 'diff-refine-change "LightBlue1")
+ )))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil")
;; `-b' switch to ignore changes in whitespaces.
@@ -1864,49 +1940,6 @@
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "devel, programming")
-
-(which-func-mode 1)
-
-(add-to-list 'auto-mode-alist '("\\.cu$" . c-mode))
-
-(defun my-c++-header-file-p ()
- "Return non-nil, if in a C++ header."
- (and (string-match "\\.h$"
- (or (buffer-file-name)
- (buffer-name)))
- (save-excursion
- (re-search-forward "\\_<class\\_>" nil t))))
-
-(when (>= emacs-major-version 22)
- (add-to-list 'magic-mode-alist '(my-c++-header-file-p . c++-mode))
- )
-
-(setq-default comment-style (quote indent))
-(setq-default comment-column 44)
-(setq-default comment-fill-column my-fill-column)
-
-(mapc (lambda (hook) (add-hook hook (lambda () (setq fill-column my-fill-column)) ))
- (append my-devel-mode-hook-list my-text-mode-hook-list))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "diff, patch, ediff, emerge")
-
-(setq diff-switches "-u")
-
-(setq ediff-diff-options "")
-(setq ediff-custom-diff-options "-u")
-(setq ediff-window-setup-function 'ediff-setup-windows-plain)
-(setq ediff-split-window-function 'split-window-vertically)
-
-(when window-system
- (eval-after-load 'diff-mode
- '(progn
- (set-face-foreground 'diff-added-face "DarkGreen")
- (set-face-foreground 'diff-removed-face "DarkRed")
- )))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "indenting")
(setq standard-indent 4)
@@ -2364,7 +2397,7 @@
(while (string-match "&#\\([[:digit:]]+\\);" html pos)
(setq res (concat res (string (string-to-int (substring html (match-beginning 1) (match-end 1)) 10))))
(setq pos (match-end 0))
- )
+ )
res
) )
@@ -2418,7 +2451,7 @@
html-tag-alist)))
(add-to-list 'html-tag-alist '("script" (\n) ("type" "text/javascript") ))
(add-to-list 'html-tag-alist '("style" (\n) ("type" "text/css") ))
- )))
+ )))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "sh, bash")