@@ -456,6 +456,22 @@ the point." ;;}}} ;;{{{ Tab - indent or complete + +(setq hippie-expand-try-functions-list + '( +; try-expand-all-abbrevs +; try-expand-list +; try-expand-line + try-expand-dabbrev + try-expand-dabbrev-all-buffers + try-expand-dabbrev-from-kill + try-complete-file-name-partially + try-complete-file-name + try-complete-lisp-symbol-partially + try-complete-lisp-symbol) + hippie-expand-verbose nil) + + ;; Indent or complete (defvar indent-or-complete-complete-function 'hippie-expand "Function to complete the word when using `indent-or-complete' @@ -1195,21 +1211,18 @@ non-nill or `compile' otherwise." ;; Indention -(defmacro tab-stop-list (&optional width columns) - "Returns list of all positive integers ordered from smallest to -largest which are multiplications of WIDTH and are lower or equal -COLUMNS. WIDTH defaults to `tab-width' and COLUMNS to 120." - (list 'eval-when-compile (list 'tab-stop-list-do width columns))) - -(defun tab-stop-list-do (&optional width columns) - (if (not width) (setq width tab-width)) - (when (<= width (or columns 120)) - (let* (l (n (/ (or columns 120) width))) - (while (> (setq l (cons (* n width) l) n (1- n)) 0)) l))) +(defmacro set-tab-stop-list (width) + "Sets `tab-stop-list' to a list of all positive from smallest to +largest which are multiplications of WIDTH and are lower or equal 120. +WIDTH must be a literal number because this macro evaluates the list +during expansion." + (let* ((w width) (n (/ 120 w)) l) + (while (> (setq l (cons (* n w) l) n (1- n)) 0)) + `(setq tab-stop-list ',l))) (setq indent-tabs-mode t) ;indent using tabs (setq tab-width 4) ;tab width -(setq tab-stop-list (tab-stop-list 4)) +(set-tab-stop-list 4) ;; One could add this to check if tab-width and c-basic-offset correspond ;(if (not (= 0 (% c-basic-offset tab-width))) ; (warn "`tab-width' does not divide `c-basic-offset'")) @@ -1383,7 +1396,9 @@ See `sort-regexp-fields'." (knr-argdecl-intro . +) (lambda-intro-cont . +) (objc-method-args-cont . c-lineup-ObjC-method-args) - (objc-method-call-cont c-lineup-ObjC-method-call-colons c-lineup-ObjC-method-call +) + (objc-method-call-cont + ;c-lineup-ObjC-method-call-colons + c-lineup-ObjC-method-call +) (objc-method-intro . [0]) ) @@ -1775,13 +1790,13 @@ argument ommited returns that number." (add-hook 'text-mode-hook (function (lambda () (auto-fill-mode t) (setq tab-width 8) - (setq tab-stop-list (tab-stop-list 8))))) + (set-tab-stop-list 8)))) ;; Assembler mode (add-hook 'asm-mode-hook (function (lambda () (setq tab-width 8) - (setq tab-stop-list (tab-stop-list 16)) + (set-tab-stop-list 16) (setq comment-column 40)))) dot-emacs c8fd43595d58613d9d3c3fc04582a9e74e52b312 Michal Nazarewicz mina86@mina86.com http://github.com/mina86/dot-files/commit/ba198f5843b077cbeff5ad542b8cccd33dc706d2 ba198f5843b077cbeff5ad542b8cccd33dc706d2 2009-08-24T23:58:42-07:00 2009-08-24T23:58:42-07:00 [emacs] Fixed few issues 1. Previous patch removed hippie-expand configuration -- recovered. 2. Pikus has older emacs and c-lineup-ObjC-method-call-colons is missing so it has been removed from objc-method-call-cont. I do not care about it anyways so no hard feelings. Also, changed tab-stop-list macro to set-tab-stop-list which sets tab-stop-list variable and evaluates the list during macro expansion -- the WIDTH argument has to be a literal number though. Also COLUMNS argument removed. 91fb1466a848956674e2c352f472bf9a150ef616 Michal Nazarewicz mina86@mina86.com