~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'ponder/master'
[profile]
/
emacs
diff --git
a/emacs
b/emacs
index
f1bbfb0
..
dcb561d
100644
(file)
--- a/
emacs
+++ b/
emacs
@@
-60,6
+60,8
@@
(trap (or mdw-fast-startup (require 'tex-site)))
(trap (or mdw-fast-startup (require 'tex-site)))
+(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+
;; --- Skeleton stuff ---
(trap (or mdw-fast-startup (require 'skel-init)))
;; --- Skeleton stuff ---
(trap (or mdw-fast-startup (require 'skel-init)))
@@
-398,6
+400,8
@@
'mouse-drag-vertical-line)
(global-set-key [vertical-scroll-bar C-mouse-1]
#'(lambda () (interactive)))
'mouse-drag-vertical-line)
(global-set-key [vertical-scroll-bar C-mouse-1]
#'(lambda () (interactive)))
+(and (not mdw-fast-startup) (fboundp 'hippie-expand)
+ (global-set-key [?\M-/] 'hippie-expand))
(defun mdw-clobber-org-mode-map ()
(dolist (key '([S-up] [S-down] [S-left] [S-right]
(defun mdw-clobber-org-mode-map ()
(dolist (key '([S-up] [S-down] [S-left] [S-right]