Browse Source

Update emacs config to make it work with emacs22.

Emmanuel Bouthenot 16 years ago
parent
commit
ae67cc612e
1 changed files with 7 additions and 22 deletions
  1. 7 22
      .emacs

+ 7 - 22
.emacs

@@ -31,19 +31,11 @@
 (add-to-list 'load-path "~/.emacs-lisp/")
 
 ;; y = yes && n = no
-(set 'yes-or-no-p 'y-or-n-p)
-
-;; zsh as default shell
-(setq explicit-shell-file-name "/bin/zsh")
+(defalias 'yes-or-no-p 'y-or-n-p)
 
 ;; disable speaker's beep
 (setq visible-bell t)
 
-;; encodings
-(set-terminal-coding-system 'utf-8-unix)
-(set-keyboard-coding-system 'utf-8-unix)
-(set-language-environment 'UTF-8)
-
 ;; set a directory to save backup files
 (setq 
  backup-by-copying t
@@ -52,25 +44,23 @@
  kept-new-versions 6
  kept-old-versions 2
  version-control t)
-;; add a timestamp tobackup files
-;;(add-hook 'write-file-hooks 'time-stamp)
-
 
 ;; autoload apache-mode
 ;; apache-mode is available in debian package emacs-goodies-el
 (autoload 'apache-mode "apache-mode" "autoloaded" t)
 
+;; transparently work with compressed files
+(auto-compression-mode 1)
+
 ;; define some modes for some filenames
 (add-to-list 'auto-mode-alist '(".htaccess$"   . apache-mode))
 (add-to-list 'auto-mode-alist '("httpd.conf$"  . apache-mode))
-(add-to-list 'auto-mode-alist '("srm.conf$"    . apache-mode))
-(add-to-list 'auto-mode-alist '("access.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("apache2.conf$"    . apache-mode))
+(add-to-list 'auto-mode-alist '("ports.conf$" . apache-mode))
 
 (add-to-list 'auto-mode-alist (cons "/etc/ssh/ssh_config" 'shell-script-mode))
 (add-to-list 'auto-mode-alist (cons "/etc/ssh/sshd_config" 'shell-script-mode))
 
-(add-to-list 'auto-mode-alist '(".gnus$" . emacs-lisp-mode))
-
 (add-to-list 'auto-mode-alist '("\\.zsh$" . shell-script-mode))
 (add-to-list 'auto-mode-alist '("\\.zshrc$" . shell-script-mode))
 
@@ -85,17 +75,12 @@
 (menu-bar-mode nil)
 
 ;; disabling tool bar
-(tool-bar-mode nil)
+;; (tool-bar-mode nil)
 
 ;; Remove startup messages
 (setq inhibit-startup-message t)
 (setq inhibit-startup-echo-area-message t)
 
-;; clock settings in modeline
-(setq display-time-24hr-format t)
-(setq display-time-day-and-date t )
-(display-time)
-
 ;; line and column number in modeline
 (setq column-number-mode t)
 (setq line-number-mode t)