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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f65a032..729c6f7 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -99,7 +99,10 @@
            (trap (server-start))
            (trap (progn
                    (require 'edit-server)
-                   (edit-server-start)))))
+                   (edit-server-start)
+                   (let ((edit (get-process "edit-server")))
+                     (and edit
+                          (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.
 
@@ -234,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)
@@ -344,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)
@@ -767,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.