~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: Fix the eshell prompt algorithm.
[profile]
/
dot
/
emacs
diff --git
a/dot/emacs
b/dot/emacs
index
f65a032
..
cb7c393
100644
(file)
--- a/
dot/emacs
+++ b/
dot/emacs
@@
-62,7
+62,7
@@
(trap (or mdw-fast-startup (require 'tex-site)))
(trap (or mdw-fast-startup (require 'tex-site)))
-(trap (or mdw-fast-startup
(semantic-load-enable-excessiv
e-code-helpers)))
+(trap (or mdw-fast-startup
t (semantic-load-enabl
e-code-helpers)))
(setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
(eval-after-load "senator"
'(setq isearch-mode-hook
(setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
(eval-after-load "senator"
'(setq isearch-mode-hook
@@
-99,7
+99,10
@@
(trap (server-start))
(trap (progn
(require 'edit-server)
(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.
;; Control backup behaviour.
@@
-234,9
+237,12
@@
(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-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)
ispell-silently-savep t)
(trap
(require 'uniquify)
@@
-344,6
+350,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)
@@
-437,6
+446,7
@@
(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 ?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)
(global-set-key [?\M-#] 'calc-dispatch)
(global-set-key [?\C-x ?/] 'auto-fill-mode)
(global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
@@
-474,6
+484,18
@@
(org-remember-insinuate)
(global-set-key [?\C-c ?r] 'org-remember)))
(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.
(setq auto-mode-alist
;; Recognising types of files.
(setq auto-mode-alist
@@
-767,7
+789,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\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
+ 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.