dot/bash_profile: Don't start new gnome-keyring-daemon processes.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index e5ae0b8..729c6f7 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,8 +62,13 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
+(eval-after-load "senator"
+  '(setq isearch-mode-hook
+        (remq 'senator-isearch-mode-hook isearch-mode-hook)
+        isearch-mode-end-hook
+        (remq 'senator-isearch-mode-hook isearch-mode-end-hook)))
 
 ;; Skeleton stuff.
 
@@ -89,8 +94,15 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 edit-server-new-frame nil
                  gnuserv-frame t)
-           (trap (server-start))))
+           (trap (server-start))
+           (trap (progn
+                   (require 'edit-server)
+                   (edit-server-start)
+                   (let ((edit (get-process "edit-server")))
+                     (and edit
+                          (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.
 
@@ -225,7 +237,7 @@
 (setq password-cache-expiry nil)
 (setq-default proced-filter 'all
              proced-sort 'user)
-(setq ispell-program-name "aspell"
+(setq ispell-program-name "aspell-hack"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
       ispell-silently-savep t)
@@ -263,10 +275,19 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
 (setq w3m-default-display-inline-images t)
 
+(eval-after-load "w3m"
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
+                   ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+     (dolist (e entries)
+       (setq w3m-content-type-alist
+            (cons e (remove* (car e) w3m-content-type-alist
+                             :key #'car :test #'string=))))))
+
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
                     buffers style search emacs nil help)
@@ -326,6 +347,9 @@
 
 ;; 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)
@@ -500,6 +524,13 @@
 
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
+(dolist (dir (remove-if-not (lambda (ext)
+                             (= (aref ext (- (length ext) 1)) ?/))
+                           completion-ignored-extensions))
+  (if (/= (aref dir 0) ?/)
+      (setq completion-ignored-extensions
+           (cons (concat "/" dir)
+                 (remove dir completion-ignored-extensions)))))
 
 ;; Some common local definitions.
 
@@ -742,7 +773,9 @@
 (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\\|pass phrase\\):")
+      comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
+      shell-file-name-chars comint-file-name-chars)
 
 ;; Notice passwords, and make C-a work right.