emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

module-cc.el: Fix c-lineup-arglist advice

Browse source
This commit is contained in:
Henrik Lissner 2015-07-16 20:37:19 +02:00
parent 10083a9952
commit 1c7a886c0c
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/module-cc.el
View file

@ -65,20 +65,18 @@
(add-hook! c++-mode 'narf|init-c++-C11-highlights)
;; Fix enum and C++11 lambda indentation
(advice-add 'c-lineup-arglist :around 'narf*c-lineup-arglist)
;; (defadvice c-lineup-arglist (around c-lineup-arglist-indent-fix activate)
;; "Improve indentation of continued C++11 lambda function opened as argument."
;; (setq ad-return-value
;; (if (and (equal major-mode 'c++-mode)
;; (ignore-errors
;; (save-excursion
;; (goto-char (c-langelem-pos langelem))
;; ;; Detect "[...](" or "[...]{". preceded by "," or "(",
;; ;; and with unclosed brace.
;; (looking-at ".*[(,][ \t]*\\[[^]]*\\][ \t]*[({][^}]*$"))))
;; 0 ; no additional indent
;; ad-do-it)))
)
(defadvice c-lineup-arglist (around c-lineup-arglist-indent-fix activate)
"Improve indentation of continued C++11 lambda function opened as argument."
(setq ad-return-value
(if (and (equal major-mode 'c++-mode)
(ignore-errors
(save-excursion
(goto-char (c-langelem-pos langelem))
;; Detect "[...](" or "[...]{". preceded by "," or "(",
;; and with unclosed brace.
(looking-at ".*[(,][ \t]*\\[[^]]*\\][ \t]*[({][^}]*$"))))
0 ; no additional indent
ad-do-it))))
(progn ; Obj-C
(add-to-list 'magic-mode-alist