~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: Add missing Pyrex keywords `enum' and `property'.
[profile]
/
el
/
dot-emacs.el
diff --git
a/el/dot-emacs.el
b/el/dot-emacs.el
index
97c20ce
..
e290e5a
100644
(file)
--- a/
el/dot-emacs.el
+++ b/
el/dot-emacs.el
@@
-1889,6
+1889,10
@@
name, as a symbol."
(list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
'(0 mdw-punct-face))))))
(list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
'(0 mdw-punct-face))))))
+(define-derived-mode sod-mode c-mode "Sod"
+ "Major mode for editing Sod code.")
+(push '("\\.sod$" . sod-mode) auto-mode-alist)
+
;;;--------------------------------------------------------------------------
;;; AP calc mode.
;;;--------------------------------------------------------------------------
;;; AP calc mode.
@@
-2427,13
+2431,13
@@
name, as a symbol."
(list
;; Handle the keywords defined above.
(list
;; Handle the keywords defined above.
- (list (concat "\\
<\\(" rust-keywords "\\)\\
>")
+ (list (concat "\\
_<\\(" rust-keywords "\\)\\_
>")
'(0 font-lock-keyword-face))
'(0 font-lock-keyword-face))
- (list (concat "\\
<\\(" rust-builtins "\\)\\
>")
+ (list (concat "\\
_<\\(" rust-builtins "\\)\\_
>")
'(0 font-lock-variable-name-face))
;; Handle numbers too.
'(0 font-lock-variable-name-face))
;; Handle numbers too.
- (list (concat "\\<\\("
+ (list (concat "\\
_
<\\("
"[0-9][0-9_]*"
"\\(" "\\(\\.[0-9_]+\\)?[eE][-+]?[0-9_]+"
"\\|" "\\.[0-9_]+"
"[0-9][0-9_]*"
"\\(" "\\(\\.[0-9_]+\\)?[eE][-+]?[0-9_]+"
"\\|" "\\.[0-9_]+"
@@
-2445,7
+2449,7
@@
name, as a symbol."
"\\|" "0b[01_]+"
"\\)"
"\\([ui]\\(8\\|16\\|32\\|64\\|s\\|size\\)\\)?"
"\\|" "0b[01_]+"
"\\)"
"\\([ui]\\(8\\|16\\|32\\|64\\|s\\|size\\)\\)?"
- "\\)\\>")
+ "\\)\\
_
>")
'(0 mdw-number-face))
;; And anything else is punctuation.
'(0 mdw-number-face))
;; And anything else is punctuation.
@@
-2630,10
+2634,10
@@
strip numbers instead."
(defun mdw-fontify-pyrex ()
(mdw-fontify-pythonic
(mdw-regexps "and" "as" "assert" "break" "cdef" "class" "continue"
(defun mdw-fontify-pyrex ()
(mdw-fontify-pythonic
(mdw-regexps "and" "as" "assert" "break" "cdef" "class" "continue"
- "ctypedef" "def" "del" "elif" "else" "except" "exec"
+ "ctypedef" "def" "del" "elif" "else" "e
num" "e
xcept" "exec"
"extern" "finally" "for" "from" "global" "if"
"import" "in" "is" "lambda" "not" "or" "pass" "print"
"extern" "finally" "for" "from" "global" "if"
"import" "in" "is" "lambda" "not" "or" "pass" "print"
- "raise" "return" "struct" "try" "while" "with"
+ "
property" "
raise" "return" "struct" "try" "while" "with"
"yield")))
;;;--------------------------------------------------------------------------
"yield")))
;;;--------------------------------------------------------------------------
@@
-3158,7
+3162,7
@@
strip numbers instead."
(local-set-key [?$] 'self-insert-command)
;; Make `tab' be useful, given that tab stops in TeX don't work well.
(local-set-key [?$] 'self-insert-command)
;; Make `tab' be useful, given that tab stops in TeX don't work well.
- (local-set-key "\C-i" 'indent-relative)
+ (local-set-key "\C-
\M-
i" 'indent-relative)
(setq indent-tabs-mode nil)
;; Set fill prefix.
(setq indent-tabs-mode nil)
;; Set fill prefix.
@@
-3677,6
+3681,9
@@
that character only to be normal punctuation.")
"\\([ \t]*\\([>#|:] ?\\)*[ \t]*\\)" 3)
(auto-fill-mode 1))
"\\([ \t]*\\([>#|:] ?\\)*[ \t]*\\)" 3)
(auto-fill-mode 1))
+(eval-after-load "flyspell"
+ '(define-key flyspell-mode-map "\C-\M-i" nil))
+
;;;--------------------------------------------------------------------------
;;; Outline and hide/show modes.
;;;--------------------------------------------------------------------------
;;; Outline and hide/show modes.
@@
-3819,6
+3826,8
@@
there is sadness."
;;;--------------------------------------------------------------------------
;;; MPC configuration.
;;;--------------------------------------------------------------------------
;;; MPC configuration.
+(eval-when-compile (trap (require 'mpc)))
+
(setq mpc-browser-tags '(Artist|Composer|Performer Album|Playlist))
(defun mdw-mpc-now-playing ()
(setq mpc-browser-tags '(Artist|Composer|Performer Album|Playlist))
(defun mdw-mpc-now-playing ()