X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=home%2Femacs%2Fian.el;h=eb245b76fb210e599b41dde413048e12536f917e;hp=689d6dbf210299181f3dfd1b7728d7a535ac3be4;hb=0f3e8bb79bdfbe54fc31347d8f97edb9ddd23455;hpb=c04bb29fbaec974ccd2ccc90d00a7c25a5eb88db diff --git a/home/emacs/ian.el b/home/emacs/ian.el index 689d6db..eb245b7 100644 --- a/home/emacs/ian.el +++ b/home/emacs/ian.el @@ -139,6 +139,36 @@ (global-set-key "\eOB" 'next-line)) (setq term-setup-hook 'terminal-keybindings) ; remap keys in due course ; +(setq frame-title-format + '(multiple-frames + (:eval + (let* + ((buf (current-buffer)) + (leaf (buffer-name buf)) + (dir default-directory)) + (if dir + (let* + ((dir (abbreviate-file-name dir)) + (node (replace-regexp-in-string "\\..*" "" system-name))) + (concat leaf " " node ":" dir)) + leaf))) + ("" invocation-name "@" system-name))) +;(setq frame-title-format +; '(multiple-frames +; (:eval +; (let* +; ((buf (current-buffer)) +; (fn (buffer-file-name buf))) +; (if fn +; (let* +; ((fn (abbreviate-file-name fn)) +; (dir (file-name-directory fn)) +; (leaf (file-name-nondirectory fn)) +; (node (replace-regexp-in-string "\\..*" "" system-name))) +; (concat leaf " " node ":" dir)) +; (buffer-name buf)))) +; ("" invocation-name "@" system-name))) +; ; Autoload definitions (autoload 'tar-mode "tar-mode") (autoload 'uncompress-while-visiting "uncompress") @@ -151,12 +181,14 @@ ; (autoload 'rmail "rmail-fixed" "Patched mail reader" t) (autoload 'quicker-compile "quicker-compile" "Patched Compile mode" t) -(autoload 'vm "vm" "Start VM on your primary inbox." t) -(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t) -(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t) -(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) -(autoload 'vm-mail "vm" "Send a mail message using VM." t) -(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) +;(autoload 'vm "vm" "Start VM on your primary inbox." t) +;(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t) +;(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t) +;(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t) +;(autoload 'vm-mail "vm" "Send a mail message using VM." t) +;(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t) +; +;(require 'vm-autoload) ; ; (autoload 'info "info-fixed" "Patched info browser" t) (setq shell-mode-hook @@ -340,7 +372,8 @@ then call send-and-exit." bbdb-message-caching-enabled t) ; ; VM stuff -;(load-file "~/private/private.el") +(if (file-exists-p "~/private/private.el") + (load-file "~/private/private.el")) (if (file-exists-p "~/private/private2.el") (load-file "~/private/private2.el")) (setq vm-included-text-attribution-format "%F writes (\"%s\"):\n" @@ -353,6 +386,7 @@ then call send-and-exit." vm-auto-next-message nil vm-jump-to-new-messages nil vm-jump-to-unread-messages nil + vm-auto-displayed-mime-content-types '("text" "multipart") vm-mime-digest-discard-header-regexp "only-drop-this-header" vm-preview-lines nil vm-included-text-prefix "> " @@ -388,40 +422,11 @@ then call send-and-exit." mail-archive-file-name "~/mail/Outbound" - vm-spool-files - '((vm-primary-inbox "/var/spool/mail/ian" - "~/mail/INBOX.CRASH") - (vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH") - (vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH") - (vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH") - (vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH") - (vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH") - (vm-sinbin-inbox "/var/spool/mail/ian" "~/mail/SINBOX.CRASH")) vm-startup-with-summary t user-mail-address "ijackson@chiark.greenend.org.uk" -; vm-spool-files -; (list -; (list vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "/var/spool/mail/ian" "~/mail/INBOX.CRASH") -; (list vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH") -; (list vm-sysadmin-inbox "~/mbox" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "~/mail/SOutbound" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "~/mail/Import" "~/mail/SINBOX.CRASH") -; (list vm-sysadmin-inbox "/var/spool/mail/sysadmin" "~/mail/SINBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mbox" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Outbound" -; "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Record" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" "/u/ijackson/mail/Import" "/u/ijackson/mail/INBOX.CRASH") -; (list "/u/ijackson/mail/INBOX" -; (concat "localhost:110:pass:ijackson:" ijackson-pop-password) -; "/u/ijackson/mail/INBOX.CRASH")) vm-startup-with-summary nil vm-summary-format "%3n %a %2d %3m %-19.19F %s\n" mail-archive-file-name "~/mail/Outbound" @@ -431,27 +436,27 @@ then call send-and-exit." '(lambda () (local-set-key "Q" 'vm-quit) (local-set-key "q" "###Q"))) -(add-hook 'mail-mode-hook - '(lambda () - (if (and (boundp 'folder-buffer) - folder-buffer - (string= (buffer-file-name folder-buffer) - (file-truename vm-sysadmin-inbox))) - (progn - (make-local-variable 'vm-mail-header-from) - (setq vm-mail-header-from - "sysadmin@chiark.greenend.org.uk (Ian Jackson)") - (make-local-variable 'mail-archive-file-name) - (setq mail-archive-file-name - "~/mail/SOutbound"))))) -; -;(defun vmi () +;(add-hook 'mail-mode-hook +; '(lambda () +; (if (and (boundp 'folder-buffer) +; folder-buffer +; (string= (buffer-file-name folder-buffer) +; (file-truename vm-sysadmin-inbox))) +; (progn +; (make-local-variable 'vm-mail-header-from) +; (setq vm-mail-header-from +; "sysadmin@chiark.greenend.org.uk (Ian Jackson)") +; (make-local-variable 'mail-archive-file-name) +; (setq mail-archive-file-name +; "~/mail/SOutbound"))))) +; +;;(defun vmi () ; (interactive) ; (vm "/u/ijackson/mail/INBOX")) ;; -(defun vms () - (interactive) - (vm vm-sinbin-inbox)) +;(defun vms () +; (interactive) +; (vm vm-sinbin-inbox)) ; (defun make-session () "Makes this emacs hard to kill by requiring ^X^Cy to kill it