a couple little things

2 files changed, 22 insertions, 16 deletions

diff --git a/email.org b/email.org
index 25e1a2a..ba0ba05 100644
--- a/email.org
+++ b/email.org
@@ -178,8 +178,7 @@
             (when (and (or (message-fetch-field "Gcc")
                            (message-fetch-field "Fcc"))
                        (not (y-or-n-p "Archive? ")))
-              (message-remove-header "Gcc")
-              (message-remove-header "Fcc")))))
+              (message-remove-header "\\(?:[BFG]cc\\)")))))
     #+end_src
 *** Check recipient
     #+begin_src emacs-lisp
diff --git a/init.org b/init.org
index c6006d2..9e11da4 100644
--- a/init.org
+++ b/init.org
@@ -1247,6 +1247,27 @@
         (add-hook 'jao-afio-switch-hook #'jao-afio--set-mode-line))
     #+end_src
 * Writing and writing modes
+*** Copyright notices
+    #+begin_src emacs-lisp
+      (setq copyright-year-ranges t)
+      (add-hook 'write-file-functions 'copyright-update)
+    #+end_src
+*** Indent on yank
+    #+begin_src emacs-lisp
+      ;;; indent on yank
+      (defvar jao-auto-indent-modes
+        '(emacs-lisp-mode ;; clojure-mode
+          scheme-mode objc-mode
+          tuareg-mode c-mode c++-mode
+          tcl-mode sql-mode
+          perl-mode cperl-mode
+          java-mode jde-mode
+          LaTeX-mode TeX-mode))
+
+      (defadvice yank (after indent-region activate)
+        (if (member major-mode jao-auto-indent-modes)
+            (indent-region (region-beginning) (region-end) nil)))
+    #+end_src
 *** Org mode
     #+begin_src emacs-lisp
       (jao-load-org "org")
@@ -1267,26 +1288,12 @@
         (require 'rect)           ; Make sure killed-rectangle is defvar'ed.
         (setq killed-rectangle (extract-rectangle start end))
         (message "Rectangle saved"))
-      ;;; indent on yank
-      (defvar jao-auto-indent-modes
-        '(emacs-lisp-mode ;; clojure-mode
-          scheme-mode objc-mode
-          tuareg-mode c-mode c++-mode
-          tcl-mode sql-mode
-          perl-mode cperl-mode
-          java-mode jde-mode
-          LaTeX-mode TeX-mode))
-
-      ;; (defadvice yank (after indent-region activate)
-      ;;   (if (member major-mode jao-auto-indent-modes)
-      ;;       (indent-region (region-beginning) (region-end) nil)))
 
       ;; text mode, autoinserts and write hooks
       ;;; misc
       (setq default-major-mode 'text-mode)
 
       (add-hook 'text-mode-hook 'turn-on-auto-fill)
-      (add-hook 'write-file-functions 'copyright-update)
     #+end_src
 *** Dictionaries
     #+BEGIN_SRC emacs-lisp