From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 4 Oct 2009 23:15:03 +0000 (+0100)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/be2cc788c85f818214bbcd3089eb2f481dd8b831?hp=918e99b0cfe5655bae0f4fea77838b3f857712e7

Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/bash_profile: Make OpenOffice not use ugly widgets.
  dot/gnus.el: Use distinct article buffers for different groups.
  dot/e16-bindings: Make 5-F6 toggle keyboard mouse control.
  dot/emacs, el/dot-emacs.el: Reformat in line with current styles.

Conflicts:
	el/dot-emacs.el: Style hacking conflicted with Python fixing
---

diff --git a/dot/e16-bindings b/dot/e16-bindings
index 2875ee7..45493bc 100644
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -57,9 +57,9 @@ KeyDown   C5       F4 menus show windowlist
 KeyDown   C5       Up wop * raise
 KeyDown   C5     Down wop * lower
 KeyDown   C5      End exit restart
-KeyDown   S5        h wop * tw conservative
-KeyDown   S5        m wop * ts conservative 
-KeyDown   S5        v wop * th conservative
+KeyDown   SC5       h wop * tw conservative
+KeyDown   SC5       m wop * ts conservative
+KeyDown   SC5       v wop * th conservative
 KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Down area move 0 1
 KeyDown   S5     Left area move -1 0
diff --git a/dot/emacs b/dot/emacs
index 2118790..fe5b563 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -62,6 +62,7 @@
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
+(setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 
 ;; Skeleton stuff.
 
@@ -483,7 +484,8 @@
 (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
 	'(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
 	  csharp-mode-hook perl-mode-hook cperl-mode-hook
-	  python-mode-hook icon-mode-hook awk-mode-hook tcl-mode-hook
+	  python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+	  tcl-mode-hook
 	  asm-mode-hook TeX-mode-hook LaTeX-mode-hook
 	  TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	  texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
@@ -573,6 +575,7 @@
 
 (setq-default py-indent-offset 2)
 (add-hook 'python-mode-hook 'mdw-fontify-python t)
+(add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)
 (setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background
 						   "Linux"
 						 "LightBG")))
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 2f61f96..41e15d3 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -807,11 +807,6 @@ (defun linux-c-mode ()
 
 ;; Make C indentation nice.
 
-(eval-after-load "cc-mode"
-  '(progn
-     (define-key c-mode-map "*" nil)
-     (define-key c-mode-map "/" nil)))
-
 (defun mdw-c-lineup-arglist (langelem)
   "Hack for DWIMmery in c-lineup-arglist."
   (if (save-excursion
@@ -1345,37 +1340,48 @@ (defun perl-number-tests (&optional arg)
 ;;;--------------------------------------------------------------------------
 ;;; Python programming style.
 
-;; Define Python fontification style.
-
-(defun mdw-fontify-python ()
+(defun mdw-fontify-pythonic (keywords)
 
   ;; Miscellaneous fiddling.
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
 
   ;; Now define fontification things.
   (make-local-variable 'font-lock-keywords)
-  (let ((python-keywords
-	 (mdw-regexps "and" "as" "assert" "break" "class" "continue" "def"
-		      "del" "elif" "else" "except" "exec" "finally" "for"
-		      "from" "global" "if" "import" "in" "is" "lambda"
-		      "not" "or" "pass" "print" "raise" "return" "try"
-		      "while" "with" "yield")))
-    (setq font-lock-keywords
-	  (list
+  (setq font-lock-keywords
+	(list
 
-	   ;; Set up the keywords defined above.
-	   (list (concat "\\<\\(" python-keywords "\\)\\>")
-		 '(0 font-lock-keyword-face))
+	 ;; Set up the keywords defined above.
+	 (list (concat "\\<\\(" python-keywords "\\)\\>")
+	       '(0 font-lock-keyword-face))
 
-	   ;; At least numbers are simpler than C.
-	   (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-			 "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
-		 '(0 mdw-number-face))
+	 ;; At least numbers are simpler than C.
+	 (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
+		       "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
+		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
+	       '(0 mdw-number-face))
 
-	   ;; And anything else is punctuation.
-	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face))))))
+	 ;; And anything else is punctuation.
+	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+	       '(0 mdw-punct-face)))))
+
+;; Define Python fontification styles.
+
+(defun mdw-fontify-python ()
+  (mdw-fontify-pythonic
+   (mdw-regexps "and" "as" "assert" "break" "class" "continue" "def"
+		"del" "elif" "else" "except" "exec" "finally" "for"
+		"from" "global" "if" "import" "in" "is" "lambda"
+		"not" "or" "pass" "print" "raise" "return" "try"
+		"while" "with" "yield")))
+
+(defun mdw-fontify-pyrex ()
+  (mdw-fontify-pythonic
+   (mdw-regexps "and" "as" "assert" "break" "cdef" "class" "continue"
+		"ctypedef" "def" "del" "elif" "else" "except" "exec"
+		"extern" "finally" "for" "from" "global" "if"
+		"import" "in" "is" "lambda" "not" "or" "pass" "print"
+		"raise" "return" "struct" "try" "while" "with"
+		"yield")))
 
 ;;;--------------------------------------------------------------------------
 ;;; Icon programming style.