Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Wed, 3 Apr 2013 20:45:53 +0000 (22:45 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 3 Apr 2013 20:45:53 +0000 (22:45 +0200)
* 'master' of git.ganneff.de:emacs:
  linws03 specific
  add linws config file
  whitespace and hippe-expand

Conflicts:
.emacs.d/config/emacs.org

1  2 
.emacs.d/config/emacs.org

@@@ -1734,16 -1738,21 +1738,31 @@@ what I want every emacs to know
  #+END_SRC
  ** w3m
  
+ ** hippie-exp
+ #+BEGIN_SRC emacs-lisp
+   (require 'hippie-exp)
+   (setq hippie-expand-try-functions-list '(try-expand-dabbrev 
+                                            try-expand-dabbrev-all-buffers 
+                                            try-expand-dabbrev-from-kill 
+                                            try-complete-file-name-partially 
+                                            try-complete-file-name 
+                                            try-expand-all-abbrevs try-expand-list
+                                            try-expand-line 
+                                            try-complete-lisp-symbol-partially 
+                                            try-complete-lisp-symbol))
+   (global-set-key (kbd "M-/") 'hippie-expand)
+ #+END_SRC
 +** elpa
 +The Emacs Lisp Package Archive (may) contain(s) some things I want
 +#+BEGIN_SRC emacs-lisp
 +  (when (> emacs-major-version 23)
 +    (require 'package)
 +    (package-initialize)
 +    (add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
 +    (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
 +    )
 +#+END_SRC
  * Customized variables
  :PROPERTIES:
  :ID: 0102208d-fdf6-4928-9e40-7e341bd3aa3a