~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: Preserve environment properly when clearing `LD_PRELOAD'.
[profile]
/
el
/
dot-emacs.el
diff --git
a/el/dot-emacs.el
b/el/dot-emacs.el
index
9453332
..
c0d2fe2
100644
(file)
--- a/
el/dot-emacs.el
+++ b/
el/dot-emacs.el
@@
-254,6
+254,7
@@
frame is actually mapped on the screen."
(mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus)
(mdw-advise-to-inhibit-raise-frame appt-disp-window)
(mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus)
(mdw-advise-to-inhibit-raise-frame appt-disp-window)
+(mdw-advise-to-inhibit-raise-frame mouse-select-window)
;; Bug fix for markdown-mode, which breaks point positioning during
;; `query-replace'.
;; Bug fix for markdown-mode, which breaks point positioning during
;; `query-replace'.
@@
-577,7
+578,7
@@
Pretend they don't exist. They might be on other display devices."
(defadvice compile (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the compilation."
(defadvice compile (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the compilation."
- (let ((process-environment
process-environment
))
+ (let ((process-environment
(copy-tree process-environment)
))
(setenv "LD_PRELOAD" nil)
ad-do-it))
(setenv "LD_PRELOAD" nil)
ad-do-it))
@@
-1034,8
+1035,7
@@
If NEW-SESSION-P, start a new session."
'(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
(defvar mdw-good-url-browsers
'(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
(defvar mdw-good-url-browsers
- '(browse-url-chromium
- browse-url-mozilla
+ '(browse-url-mozilla
browse-url-generic
(w3m . mdw-w3m-browse-url)
browse-url-w3)
browse-url-generic
(w3m . mdw-w3m-browse-url)
browse-url-w3)
@@
-2080,7
+2080,7
@@
name, as a symbol."
"__typeof__" ;GCC
"__volatile__" ;GCC
))
"__typeof__" ;GCC
"__volatile__" ;GCC
))
- (c-
constant
s
+ (c-
builtin
s
(mdw-regexps "false" ;C++, C99 macro
"this" ;C++
"true" ;C++, C99 macro
(mdw-regexps "false" ;C++, C99 macro
"this" ;C++
"true" ;C++, C99 macro
@@
-2116,7
+2116,7
@@
name, as a symbol."
(list (concat "\\<\\(" c-keywords "\\)\\>")
'(0 font-lock-keyword-face))
(list (concat "\\<\\(" c-keywords "\\)\\>")
'(0 font-lock-keyword-face))
- (list (concat "\\<\\(" c-
constant
s "\\)\\>")
+ (list (concat "\\<\\(" c-
builtin
s "\\)\\>")
'(0 font-lock-variable-name-face))
;; Handle numbers too.
'(0 font-lock-variable-name-face))
;; Handle numbers too.
@@
-2229,7
+2229,7
@@
name, as a symbol."
"void" "volatile"
"while"))
"void" "volatile"
"while"))
- (java-
constant
s
+ (java-
builtin
s
(mdw-regexps "false" "null" "super" "this" "true")))
(setq font-lock-keywords
(mdw-regexps "false" "null" "super" "this" "true")))
(setq font-lock-keywords
@@
-2239,8
+2239,8
@@
name, as a symbol."
(list (concat "\\<\\(" java-keywords "\\)\\>")
'(0 font-lock-keyword-face))
(list (concat "\\<\\(" java-keywords "\\)\\>")
'(0 font-lock-keyword-face))
- ;; Handle the magic
constant
s defined above.
- (list (concat "\\<\\(" java-
constant
s "\\)\\>")
+ ;; Handle the magic
builtin
s defined above.
+ (list (concat "\\<\\(" java-
builtin
s "\\)\\>")
'(0 font-lock-variable-name-face))
;; Handle numbers too.
'(0 font-lock-variable-name-face))
;; Handle numbers too.
@@
-2282,11
+2282,8
@@
name, as a symbol."
"private" "protected" "public" "return" "short"
"static" "super" "switch" "synchronized" "throw"
"throws" "transient" "try" "typeof" "var" "void"
"private" "protected" "public" "return" "short"
"static" "super" "switch" "synchronized" "throw"
"throws" "transient" "try" "typeof" "var" "void"
- "volatile" "while" "with" "yield"
-
- "boolean" "byte" "char" "double" "float" "int" "long"
- "short" "void"))
- (javascript-constants
+ "volatile" "while" "with" "yield"))
+ (javascript-builtins
(mdw-regexps "false" "null" "undefined" "Infinity" "NaN" "true"
"arguments" "this")))
(mdw-regexps "false" "null" "undefined" "Infinity" "NaN" "true"
"arguments" "this")))
@@
-2297,8
+2294,8
@@
name, as a symbol."
(list (concat "\\_<\\(" javascript-keywords "\\)\\_>")
'(0 font-lock-keyword-face))
(list (concat "\\_<\\(" javascript-keywords "\\)\\_>")
'(0 font-lock-keyword-face))
- ;; Handle the predefined
constant
s defined above.
- (list (concat "\\_<\\(" javascript-
constant
s "\\)\\_>")
+ ;; Handle the predefined
builtin
s defined above.
+ (list (concat "\\_<\\(" javascript-
builtin
s "\\)\\_>")
'(0 font-lock-variable-name-face))
;; Handle numbers too.
'(0 font-lock-variable-name-face))
;; Handle numbers too.
@@
-2424,7
+2421,7
@@
name, as a symbol."
"unsafe" "ushort" "using" "virtual" "void" "volatile"
"while" "yield"))
"unsafe" "ushort" "using" "virtual" "void" "volatile"
"while" "yield"))
- (csharp-
constant
s
+ (csharp-
builtin
s
(mdw-regexps "base" "false" "null" "this" "true")))
(setq font-lock-keywords
(mdw-regexps "base" "false" "null" "this" "true")))
(setq font-lock-keywords
@@
-2434,8
+2431,8
@@
name, as a symbol."
(list (concat "\\<\\(" csharp-keywords "\\)\\>")
'(0 font-lock-keyword-face))
(list (concat "\\<\\(" csharp-keywords "\\)\\>")
'(0 font-lock-keyword-face))
- ;; Handle the magic
constant
s defined above.
- (list (concat "\\<\\(" csharp-
constant
s "\\)\\>")
+ ;; Handle the magic
builtin
s defined above.
+ (list (concat "\\<\\(" csharp-
builtin
s "\\)\\>")
'(0 font-lock-variable-name-face))
;; Handle numbers too.
'(0 font-lock-variable-name-face))
;; Handle numbers too.
@@
-2649,15
+2646,17
@@
name, as a symbol."
(defun mdw-fontify-rust ()
;; Hack syntax categories.
(defun mdw-fontify-rust ()
;; Hack syntax categories.
+ (modify-syntax-entry ?$ ".")
+ (modify-syntax-entry ?% ".")
(modify-syntax-entry ?= ".")
;; Fontify keywords and things.
(make-local-variable 'font-lock-keywords)
(let ((rust-keywords
(modify-syntax-entry ?= ".")
;; Fontify keywords and things.
(make-local-variable 'font-lock-keywords)
(let ((rust-keywords
- (mdw-regexps "abstract" "alignof" "as"
+ (mdw-regexps "abstract" "alignof" "as"
"async" "await"
"become" "box" "break"
"become" "box" "break"
- "const" "continue" "cr
e
ate"
- "do"
+ "const" "continue" "crate"
+ "do"
"dyn"
"else" "enum" "extern"
"final" "fn" "for"
"if" "impl" "in"
"else" "enum" "extern"
"final" "fn" "for"
"if" "impl" "in"
@@
-2667,8
+2666,8
@@
name, as a symbol."
"priv" "proc" "pub" "pure"
"ref" "return"
"sizeof" "static" "struct" "super"
"priv" "proc" "pub" "pure"
"ref" "return"
"sizeof" "static" "struct" "super"
- "trait" "type" "typeof"
- "unsafe" "unsized" "use"
+ "trait" "t
ry" "t
ype" "typeof"
+ "un
ion" "un
safe" "unsized" "use"
"virtual"
"where" "while"
"yield"))
"virtual"
"where" "while"
"yield"))
@@
-2701,7
+2700,7
@@
name, as a symbol."
"\\|" "0o[0-7_]+"
"\\|" "0b[01_]+"
"\\)"
"\\|" "0o[0-7_]+"
"\\|" "0b[01_]+"
"\\)"
- "\\([ui]\\(8\\|16\\|32\\|64\\|s
\\|s
ize\\)\\)?"
+ "\\([ui]\\(8\\|16\\|32\\|64\\|size\\)\\)?"
"\\)\\_>")
'(0 mdw-number-face))
"\\)\\_>")
'(0 mdw-number-face))
@@
-2865,7
+2864,7
@@
strip numbers instead."
'(0 font-lock-keyword-face))
;; At least numbers are simpler than C.
'(0 font-lock-keyword-face))
;; At least numbers are simpler than C.
- (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[
0-7
]+\\)\\|"
+ (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[
oO]?[0-7]+\\|[bB][01
]+\\)\\|"
"\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)"
"\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)")
'(0 mdw-number-face))
"\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)"
"\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)")
'(0 mdw-number-face))
@@
-3168,6
+3167,8
@@
strip numbers instead."
(local-set-key [?*] 'mdw-rexx-electric-*)
(mapcar #'(lambda (ch) (modify-syntax-entry ch "w"))
'(?! ?? ?# ?@ ?$))
(local-set-key [?*] 'mdw-rexx-electric-*)
(mapcar #'(lambda (ch) (modify-syntax-entry ch "w"))
'(?! ?? ?# ?@ ?$))
+ (mapcar #'(lambda (ch) (modify-syntax-entry ch "."))
+ '(?¬))
(mdw-standard-fill-prefix "\\([ \t]*/?\*[ \t]*\\)")
;; Set up keywords and things for fontification.
(mdw-standard-fill-prefix "\\([ \t]*/?\*[ \t]*\\)")
;; Set up keywords and things for fontification.
@@
-3509,6
+3510,11
@@
strip numbers instead."
LaTeX-fill-break-at-separators '(\\\[))
;;;--------------------------------------------------------------------------
LaTeX-fill-break-at-separators '(\\\[))
;;;--------------------------------------------------------------------------
+;;; HTML, CSS, and other web foolishness.
+
+(setq css-indent-offset 2)
+
+;;;--------------------------------------------------------------------------
;;; SGML hacking.
(defun mdw-sgml-mode ()
;;; SGML hacking.
(defun mdw-sgml-mode ()
@@
-4027,13
+4033,13
@@
This allows you to pass a list of arguments through `ansi-term'."
(defadvice term-exec-1 (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the terminal."
(defadvice term-exec-1 (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the terminal."
- (let ((process-environment
process-environment
))
+ (let ((process-environment
(copy-tree process-environment)
))
(setenv "LD_PRELOAD" nil)
ad-do-it))
(defadvice shell (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the shell."
(setenv "LD_PRELOAD" nil)
ad-do-it))
(defadvice shell (around hack-environment compile activate)
"Hack the environment inherited by inferiors in the shell."
- (let ((process-environment
process-environment
))
+ (let ((process-environment
(copy-tree process-environment)
))
(setenv "LD_PRELOAD" nil)
ad-do-it))
(setenv "LD_PRELOAD" nil)
ad-do-it))