fix and change bindings and icons

settings/general-settings.el

@@ -61,14 +61,15 @@
         t))))
 
 (use-package ibuf-ext
-  :defer t
+  :after (ibuffer)
+  :bind ((:map ibuffer-mode-map
+               (("/ u" . ibuffer-filter-by-unsaved))))
   :config
   (define-ibuffer-filter unsaved
       "Toggle current view to buffers whose file is unsaved."
     (:description "file is unsaved")
     (with-current-buffer buf
-      (and buffer-file-name (buffer-modified-p))))
-  (define-key ibuffer-mode-map (kbd "/ u") 'ibuffer-filter-by-unsaved))
+      (and buffer-file-name (buffer-modified-p)))))
 
 ;; recentf stuff
 (use-package recentf
@@ -314,32 +315,48 @@ Version 2016-07-13"
 
 ;; A better *Help* buffer
 (use-package helpful
+  ;;:after counsel
   :bind
   (;; Note that the built-in `describe-function' includes both functions
    ;; and macros. `helpful-function' is functions only, so we provide
    ;; `helpful-callable' as a drop-in replacement to include `helpful-macro'.
-   ("C-h f" . describe-function)
-   ;; ("C-h f" . helpful-callable)
-   ("C-h v" . describe-variable)
-   ;; ("C-h v" . helpful-variable)
-   ("C-h k" . helpful-key)
+
+   ;; ("C-h f" . helpful-callable)  ;; C-h f default describe-function
+   ;; ("C-h v" . helpful-variable)  ;; C-h v default describe-variable
+   ;; ("C-h k" . helpful-key)       ;; C-h k default describe-key
+
    ;; Lookup the current symbol at point. C-c C-d is a common keybinding
    ;; for this in lisp modes.
    ("C-c C-d" . helpful-at-point)
+
    ;; Look up *F*unctions (excludes macros).
    ;; By default, C-h F is bound to `Info-goto-emacs-command-node'. Helpful
    ;; already links to the manual, if a function is referenced there.
-   ("C-h F" . helpful-function)
+   ;; ("C-h F" . helpful-function)
+   ;; Look up functions including macros (like `describe-function').
+   ("C-h F" . helpful-callable)
+   ;; ("C-h F" . counsel-describe-function)  ;; calls helpful-callable, see below
+
+   ;; Look up *K*eys.
+   ;; By default, C-h K is bound to `Info-goto-emacs-key-command-node'.
+   ;; Helpful already links to the manual, if a key is referenced there.
+   ("C-h K" . helpful-key)
+
+   ;; Look up *V*ariable.
+   ("C-h V" . helpful-variable)
+   ;; ("C-h V" . counsel-describe-variable)  ;; calls helpful-vraiable, see below
+
    ;; Look up *C*ommands.
    ;; By default, C-h C is bound to describe `describe-coding-system'. I
    ;; don't find this very useful, but it's frequently useful to only
    ;; look at interactive functions.
    ("C-h C" . helpful-command))
   :config
-  (with-eval-after-load 'ivy
-    ;; Ivy users can use Helpful with counsel commands:
-    (setq counsel-describe-function-function #'helpful-callable)
-    (setq counsel-describe-variable-function #'helpful-variable)))
+  ;; (with-eval-after-load 'ivy
+  ;;   ;; Ivy users can use Helpful with counsel commands:
+  ;;   (setq counsel-describe-function-function #'helpful-callable)
+  ;;   (setq counsel-describe-variable-function #'helpful-variable))
+  )
 
 ;;
 ;; keyboard
@@ -764,8 +781,12 @@ Version 2016-07-13"
         ))
     (easy-menu-define my-org-minor-mode-menu nil "My Org Minor Mode Menu"
       '("Org Minor Mode / Toggles" :visible (eq major-mode 'org-mode)
+        ["Org Appear" org-appear-mode
+         :style toggle :selected org-appear-mode :help "org-appear-mode"]
         ["Org Fancy Priorities [Ⓟ]" org-fancy-priorities-mode
          :style toggle :selected org-fancy-priorities-mode :help "org-sticky-header-mode"]
+        ["Org Indent" org-indent-mode
+         :style toggle :selected org-indent-mode :help "org-indent-mode"]
         ["Org Latex Remove Logfiles" (setq org-latex-remove-logfiles (not org-latex-remove-logfiles))
          :style toggle :selected org-latex-remove-logfiles :help "org-latex-remove-logfiles"]
         ["Org Link Descriptive" org-toggle-link-display