From 8108ed3f39fc7b37a3e378f87f7c9da17336c7bb Mon Sep 17 00:00:00 2001 From: Luo Jinghua Date: Sat, 9 Jan 2010 20:34:07 +0800 Subject: sync emacs with emacs-win32 --- emacs | 294 ++++++++---------------------------------------------------------- 1 file changed, 34 insertions(+), 260 deletions(-) diff --git a/emacs b/emacs index 9ba74e7..a5f30d6 100644 --- a/emacs +++ b/emacs @@ -6,7 +6,7 @@ (if window-system (progn ;; font setting - (set-default-font "Bitstream Vera Sans Mono-9") + (set-frame-font "Bitstream Vera Sans Mono-9") (set-fontset-font (frame-parameter nil 'font) 'han '("Microsfot Yahei" . "unicode-bmp")) @@ -16,14 +16,29 @@ ;; setup show startup message (setq inhibit-startup-message t) -(setq semantic-load-turn-useful-things-on t) -(load "/usr/share/emacs/site-lisp/site-gentoo") +(require 'site-gentoo) ;;(setq-default make-backup-files nil) -;; load ecb + +;; load cedet, semantic and ecb (setq ecb-auto-activate t) +(setq semantic-load-turn-useful-things-on t) +(require 'cedet) (require 'ecb) +(semantic-load-enable-code-helpers) +(require 'semanticdb) +;;(global-semanticdb-minor-mode 1) +(require 'semantic-ia) +(global-set-key [(control p)] 'semantic-ia-complete-symbol-menu) +;;# semantic-ia-complete-symbol +;;# semantic-ia-complete-symbol-menu +;;# semantic-ia-complete-tip +;;(global-semantic-show-dirty-mode -1) +(global-semantic-show-unmatched-syntax-mode -1) +(require 'semantic-load) +;;(global-semantic-idle-completions-mode 1) + ;; set color theme if emacs is windowed (require 'color-theme) @@ -59,7 +74,15 @@ (require 'session) (add-hook 'after-init-hook 'session-initialize) -;;kill a line +;; setup tabbar +(require 'tabbar) +(tabbar-mode) +(global-set-key [(s-down)] 'tabbar-backward-group) +(global-set-key [(s-up)] 'tabbar-forward-group) +(global-set-key (kbd "s-b") 'tabbar-backward) +(global-set-key (kbd "s-f") 'tabbar-forward) + +;; kill a line (defun kill-whole-line nil "delete the whole line" (interactive) @@ -77,120 +100,17 @@ (byte-compile-file (buffer-file-name)))) (add-hook 'after-save-hook 'autocompile) -;;---------------------------------------------------------------------------- -(setq tab-width 4) -;;(setq c-basic-offset 4) -;;(setq c-hanging-comment-ender-p nil) -;;(setq-default indent-tabs-mode nil) - -;; define a new indentation style -(require 'cc-styles) -(add-to-list 'c-style-alist - '("ljh" - (indent-tabs-mode nil) - (c-basic-offset . 4) - (c-comment-only-line-offset . 0) - (c-offsets-alist . ((statement-block-intro . +) - (knr-argdecl-intro . 0) - (substatement-open . 0) - (substatement-label . 0) - (label . 1) - (statement-cont . +) - (arglist-intro . c-lineup-arglist-intro-after-paren) - (arglist-close . c-lineup-arglist) - )) - ) - ) - -(add-to-list 'c-style-alist - '("tables" - (c-basic-offset . 8) - (c-comment-only-line-offset . 0) - (c-offsets-alist . ((statement-block-intro . +) - (knr-argdecl-intro . 0) - (substatement-open . 0) - (substatement-label . 0) - (label . 1) - (statement-cont . +) - (inline-open 0) - (innamespace . 0) - (arglist-intro . c-lineup-arglist-intro-after-paren) - (arglist-close . c-lineup-arglist) - )) - ) - ) - -(add-hook 'c-mode-common-hook - (function - (lambda () - ;; (c-set-style "ljh") - (hl-line-mode t) - (linum-mode) - ))) -(add-hook 'c++-mode-hook - (function - (lambda () - (c-set-style "ljh") - (hl-line-mode t) - ))) - -(add-hook 'python-mode-hook - (function - (lambda () - (hl-line-mode t) - (linum-mode) - ))) - -(defun gstreamer-c-mode () - "C mode with adjusted defaults for use with GStreamer." - (interactive) - (c-mode) - (c-set-style "K&R") - (setq c-basic-offset 2)) - -(setq auto-mode-alist (cons '("gst.*/.*\\.[ch]$" . gstreamer-c-mode) - auto-mode-alist)) - -(defun ljh-c-mode () - "C mode with adjusted defaults for myself." - (interactive) - (c-mode) - (c-set-style "ljh")) -(setq auto-mode-alist (cons '("milkway.*/.*\\.[ch]$" . ljh-c-mode) - auto-mode-alist)) - -(setq auto-mode-alist (cons '("openpps.*/.*\\.[ch]$" . ljh-c-mode) - auto-mode-alist)) +;; setup cc styles +(require 'setup-cc-styles) ;; guess offset (require 'guess-offset) -(require 'semanticdb) -;;(global-semanticdb-minor-mode 1) -(require 'semantic-ia) -(global-set-key [(control p)] 'semantic-ia-complete-symbol-menu) -;;# semantic-ia-complete-symbol -;;# semantic-ia-complete-symbol-menu -;;# semantic-ia-complete-tip - -(require 'tabbar) -(tabbar-mode) -(global-set-key [(s-down)] 'tabbar-backward-group);; -(global-set-key [(s-up)] 'tabbar-forward-group) -(global-set-key (kbd "s-b") 'tabbar-backward);; -(global-set-key (kbd "s-f") 'tabbar-forward) - ;;M-x desktop-clear ;;(load "desktop") ;;(desktop-save-mode) ;;(desktop-read) ;;(global-set-key [f11] 'desktop-save) - -;;(global-semantic-show-dirty-mode -1) -(global-semantic-show-unmatched-syntax-mode -1) -(require 'semantic-load) -;;(global-semantic-idle-completions-mode 1) - (require 'doxymacs) (add-hook 'c-mode-common-hook 'doxymacs-mode) @@ -209,155 +129,8 @@ ;;(add-hook 'python-mode-hook '(lambda () (set-fill-column 80))) ;;(add-hook 'java-mode-hook '(lambda () (set-fill-column 80))) -;;auto-complete -(require 'auto-complete) -(require 'auto-complete-config) -(require 'yasnippet) - -(global-auto-complete-mode t) -(setq ac-auto-start 2) - -(define-key ac-complete-mode-map "\t" 'ac-expand) -(define-key ac-complete-mode-map "\r" 'ac-complete) -(define-key ac-complete-mode-map (kbd "M-j") 'ac-complete) -(define-key ac-complete-mode-map (kbd "M-n") 'ac-next) -(define-key ac-complete-mode-map (kbd "M-p") 'ac-previous) - -(setq ac-dwim t) -(setq ac-candidate-menu-height 20) -(setq ac-candidate-max ac-candidate-menu-height) - -(set-default 'ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-imenu - ac-source-files-in-current-dir - ac-source-filename)) -;;(setq ac-modes ac+-modes) - -(setq ac-trigger-commands '(self-insert-command autopair-insert-or-skip-quote)) - -(defun ac-settings-4-lisp () - "Auto complete settings for lisp mode." - (setq ac-omni-completion-sources '(("require\s+'" ac-source-emacs-lisp-features) - ("load\s+\"" ac-source-emacs-lisp-features))) - (setq ac-sources - '(ac-source-yasnippet - ac-source-symbols - ac-source-semantic - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-imenu - ac-source-files-in-current-dir - ac-source-filename))) - -(defun ac-settings-4-java () - (setq ac-omni-completion-sources (list (cons "\\." '(ac-source-semantic)) - (cons "->" '(ac-source-semantic)))) - (setq ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename))) - -(defun ac-settings-4-c () - (setq ac-omni-completion-sources (list (cons "\\." '(ac-source-semantic)) - (cons "->" '(ac-source-semantic)))) - (setq ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-c-keywords - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename))) - -(defun ac-settings-4-cpp () - (setq ac-omni-completion-sources - (list (cons "\\." '(ac-source-semantic)) - (cons "->" '(ac-source-semantic)))) - (setq ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-c++-keywords - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename))) - -(defun ac-settings-4-python () - (setq ac-omni-completion-sources - '(("\\." ac-source-ropemacs))) - (setq ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename))) - -(defun ac-settings-4-text () - (setq ac-sources - '(;;ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-imenu))) - -(defun ac-settings-4-eshell () - (setq ac-sources - '(;;ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename - ac-source-symbols - ac-source-imenu))) - -(defun ac-settings-4-ruby () - (setq ac-omni-completion-sources - (list (cons "\\." '(ac-source-rcodetools)) - (cons "::" '(ac-source-rcodetools))))) - -(defun ac-settings-4-html () - (setq ac-sources - '(ac-source-semantic - ac-source-yasnippet - ac-source-abbrev - ac-source-words-in-buffer - ac-source-words-in-all-buffer - ac-source-files-in-current-dir - ac-source-filename))) - -(dolist (hook (list 'lisp-mode-hook 'emacs-lisp-mode-hook 'lisp-interaction-mode-hook - 'svn-log-edit-mode)) - (add-hook hook 'ac-settings-4-lisp)) - -(add-hook 'java-mode-hook 'ac-settings-4-java) -(add-hook 'c-mode-hook 'ac-settings-4-c) -(add-hook 'c++-mode-hook 'ac-settings-4-cpp) -(add-hook 'python-mode-hook 'ac-settings-4-python) -(add-hook 'text-mode-hook 'ac-settings-4-text) -(add-hook 'eshell-mode-hook 'ac-settings-4-eshell) -(add-hook 'html-mode-hook 'ac-settings-4-html) - -;;(dolist (mode ac-modes) -;; (let ((mode-name (symbol-name mode))) -;; (when (and (intern-soft mode-name) (intern-soft (concat mode-name "-map"))) -;; (define-key (symbol-value (concat-name mode-name "-map")) (kbd "C-c a") 'ac-start)))) +;; setup auto-complete-mode +(require 'setup-auto-complete) (custom-set-variables ;; custom-set-variables was added by Custom. @@ -367,7 +140,7 @@ '(column-number-mode t) '(display-time-mode t) '(ecb-options-version "2.40") - '(ecb-source-path (quote (("/" "/") ("~/Projects" "Projects")))) + '(ecb-source-path (quote (("~/Projects" "Projects")))) '(scroll-bar-mode (quote right)) '(show-paren-mode t) '(show-trailing-whitespace t) @@ -381,3 +154,4 @@ ) (put 'narrow-to-region 'disabled nil) + -- cgit v1.2.3