 ;; e.g. "C++/l" into "C++". Since we are overriding a function
 ;; provided by `cc-mode', which is not initially loaded, we have to
 ;; make sure to do so *after* it is loaded and not before.
-(eval-after-load 'cc-mode
-  (lambda ()
-    (advice-add #'c-update-modeline :override #'ignore)))
+(with-eval-after-load 'cc-mode
+  (advice-add #'c-update-modeline :override #'ignore))
 
 ;; Switch to a better indentation-and-braces style. This turns the
 ;; following code:

;; if (condition) {
;;   statement;
;; }
(eval-after-load 'cc-mode
  '(progn
     (if (assoc 'other c-default-style)
         (setcdr (assoc 'other c-default-style)
                 "k&r")
       (push '(other . "k&r") c-default-style))
     (setq-default c-basic-offset 2)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; Packages: Managing Emacs

  (diminish 'abbrev-mode)

  ;; Don't show `smerge-mode' in the mode line.
  (with-eval-after-load 'smerge-mode
    (diminish 'smerge-mode)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; Packages: Window management
