dot/emacs: Longer logs by default in Magit.
[profile] / dot / emacs
index 98852a4..1a69858 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -23,6 +23,7 @@
 
 (setq load-path (nconc load-path (list "~/lib/emacs")))
 (require 'dot-emacs)
+(require 'cl)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+(trap (or mdw-fast-startup t (semantic-load-enable-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 (eval-after-load "senator"
   '(setq isearch-mode-hook
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens)
-(setq mail-signature t)
-(setq mail-yank-prefix "> ")
-(setq mail-archive-file-name "~/Mail/sent")
+(setq mail-from-style 'angles
+      mail-signature t
+      mail-yank-prefix "> "
+      mail-archive-file-name "~/Mail/sent"
+      compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
+      message-send-mail-function 'message-send-mail-with-sendmail
+      message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
                                         mdw-trim-spaces-after-citing))
 
 (setq scroll-step 5)                   ;Don't scroll too much at a time
 (setq-default fill-column 77)          ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
-(setq-default truncate-partial-width-windows nil)
+(setq-default truncate-partial-width-windows nil
+             truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq whitespace-style
-      '(trailing space-before-tab space-after-tab empty indentation))
+      '(trailing space-before-tab space-after-tab empty indentation face))
 (setq woman-use-own-frame nil          ;Keep man pages somewhere sensible
       woman-fill-column 72)            ;Right margin position.
 (setq diff-switches "-u"               ;I like reading unified diffs
 (setq ispell-program-name "aspell-hack"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
+      ispell-local-dictionary-alist
+      '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t
+        ("-d" "en_GB-ize-w_accents") nil utf-8))
       ispell-silently-savep t)
 (trap
   (require 'uniquify)
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(setq imenu-auto-rescan t
+      imenu-auto-rescan-maxout (* 128 1024)
+      imenu-max-items 60)
+
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
 
 ;; Cosmetic stuff.
 
+(setq calendar-view-diary-initially-flag t
+      calendar-view-holidays-initially-flag t)
+
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap
-  (if window-system
-      (let ((view-diary-entries-initially t))
-       (calendar))))
+(trap (if window-system (calendar)))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.
   (global-set-key [?\C-x ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare)
   (global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit)
+  (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
   (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
                  'mouse-drag-vertical-line)
   (global-set-key [vertical-scroll-bar C-mouse-1]
                  #'(lambda () (interactive)))
+  (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
 (add-hook 'org-agenda-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 (or mdw-fast-startup
-    (progn
-      (org-remember-insinuate)
-      (global-set-key [?\C-c ?r] 'org-remember)))
+    (trap (progn
+           (org-remember-insinuate)
+           (global-set-key [?\C-c ?r] 'org-remember))))
+
+;; Minor mode listing
+
+(setq minor-mode-alist
+      (mdw-uniquify-alist '((reveal-mode (hs-minor-mode
+                                         " hs/r"
+                                         (global-reveal-mode
+                                          "" " Reveal")))
+                           (hs-minor-mode (reveal-mode "" " hs"))
+                           (abbrev-mode "")
+                           (gtags-mode ""))
+                         minor-mode-alist))
 
 ;; Recognising types of files.
 
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"
+                         "\\.topmsg" "\\|"
                          "\\.git/COMMIT_EDITMSG" "\\|"
                          "svn-commit\\.tmp" "\\|"
                          "svk-commit[^/.]*\\.tmp"
              auto-mode-alist))
 
 (setq interpreter-mode-alist
-      (append `(("runlisp" . lisp-mode))
+      (append `(("runlisp" . lisp-mode)
+               ("@BASH" . sh-mode)
+               ("@PYTHON@" . python-mode)
+               ("@PERL@" . perl-mode)
+               ("@TCLSH@" . tcl-mode)
+               ("@WISH@" . tcl-mode))
              interpreter-mode-alist))
 
 (setq completion-ignored-extensions
 
 (make-variable-buffer-local 'mdw-auto-indent)
 
-(mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
-       '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
-         csharp-mode-hook perl-mode-hook cperl-mode-hook
-         python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-         tcl-mode-hook go-mode-hook
-         asm-mode-hook TeX-mode-hook LaTeX-mode-hook
-         TeXinfo-mode-hook tex-mode-hook latex-mode-hook
-         texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
-         lisp-mode-hook lisp-interaction-mode-hook
-         inferior-lisp-mode-hook slime-repl-mode-hook
-         sml-mode-hook haskell-mode-hook erlang-mode-hook
-         smalltalk-mode-hook rexx-mode-hook
-         arm-assembler-mode-hook))
+(mapc (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
+      '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
+       csharp-mode-hook perl-mode-hook cperl-mode-hook
+       python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+       tcl-mode-hook go-mode-hook js-mode-hook conf-mode-hook
+       m4-mode-hook autoconf-mode-hook autotest-mode-hook
+       asm-mode-hook TeX-mode-hook LaTeX-mode-hook
+       TeXinfo-mode-hook tex-mode-hook latex-mode-hook
+       texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
+       lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
+       inferior-lisp-mode-hook slime-repl-mode-hook
+       sml-mode-hook haskell-mode-hook erlang-mode-hook
+       smalltalk-mode-hook rexx-mode-hook
+       arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
 (defalias 'perl-mode 'cperl-mode)
               (tramp-remote-sh "/bin/sh"))
              ,@tramp-methods)))
      (setq tramp-default-method "ssh")
-     (setq tramp-default-method-alist
-          `(("\\`\\(localhost\\|\\)\\'" ""
-             ,(cond ((executable-find "become") "become")
-                    ((executable-find "really") "really")
-                    (t "su")))))))
+     (let ((rootlyness (cond ((executable-find "really") "really")
+                            ((executable-find "become") "become")
+                            ((executable-find "sudo") "sudo")
+                            (t "su")))
+          (this-host (concat "\\`\\(localhost\\|"
+                             (system-name) "\\|\\)\\'"))
+          (this-user (concat "\\`\\(" (user-login-name) "\\|"
+                             (user-real-login-name) "\\|\\)\\'")))
+       (setq tramp-default-method-alist
+            `((,this-host nil ,rootlyness)
+              (nil ,this-user "ssh")
+              (nil "." ,rootlyness)))
+       (setq tramp-default-proxies-alist
+            `((,this-host nil nil)
+              (nil "." "/ssh:%h:"))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.
   (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
   (add-hook 'java-mode-hook 'mdw-fontify-java t)
+  (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
   (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
 
   (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
 
 (progn
   (setq-default py-indent-offset 2
+               python-indent 2
                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))
 
 (add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode)
 (add-hook 'autoconf-mode-hook #'mdw-setup-m4)
+(add-hook 'autotest-mode-hook #'mdw-setup-m4)
 (add-hook 'm4-mode-hook #'mdw-setup-m4)
 
 (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
        ("^pdf$" "." "evince %o")
        ("^html?$" "." "netscape %o")))
 
+(setq TeX-view-program-selection
+      '(((output-dvi style-pstricks) "dvips and gv")
+       (output-dvi "xdvi")
+       (output-pdf "Evince")
+       (output-html "xdg-open")))
+
 (setq TeX-open-quote "\""
       TeX-close-quote "\"")
 
        ("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2)
        ("proposition" ?P "prop:" "~\\ref{%s}" t
         ("propositions?" "prop\\.") -2)
-       ("lemma" ?P "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
+       ("lemma" ?L "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
        ("example" ?X "eg:" "~\\ref{%s}" t ("examples?") -2)
        ("exercise" ?E "ex:" "~\\ref{%s}" t ("exercises?" "ex\\.") -2)
        ("enumerate" ?i "i:" "~\\ref{%s}" item ("items?"))))
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-             "[Pp]assword\\|pass phrase\\):")
+             "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
       comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
       shell-file-name-chars comint-file-name-chars)