~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
el/dot-emacs.el: Don't use a fancy face for `which-func'.
[profile]
/
dot
/
emacs
diff --git
a/dot/emacs
b/dot/emacs
index
ab9a94f
..
729c6f7
100644
(file)
--- a/
dot/emacs
+++ b/
dot/emacs
@@
-94,8
+94,15
@@
(and (or window-system (>= emacs-major-version 23))
(progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
(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)
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.
;; Control backup behaviour.
@@
-230,7
+237,7
@@
(setq password-cache-expiry nil)
(setq-default proced-filter 'all
proced-sort 'user)
(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)
ispell-local-dictionary "en_GB-ize-w_accents"
flyspell-default-dictionary "en_GB-ize-w_accents"
ispell-silently-savep t)
@@
-340,6
+347,9
@@
;; Cosmetic stuff.
;; 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)
(setq display-time-24hr-format t)
(display-time)
(column-number-mode 1)
@@
-763,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 \\|^\\)"
(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.
;; Notice passwords, and make C-a work right.