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

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
---

be2cc788c85f818214bbcd3089eb2f481dd8b831
diff --cc dot/emacs
index 9e1f688,2118790..fe5b563
--- a/dot/emacs
+++ b/dot/emacs
@@@ -61,9 -62,8 +62,9 @@@
  (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 ---
+ ;; Skeleton stuff.
  
  (trap (or mdw-fast-startup (require 'skel-init)))
  
diff --cc el/dot-emacs.el
index c9b9623,2f61f96..41e15d3
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -809,8 -805,13 +805,8 @@@ doesn't match any of the regular expres
    (setq mode-name "Linux C")
    (run-hooks 'linux-c-mode-hook))
  
- ;; --- Make C indentation nice ---
+ ;; 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
@@@ -1370,59 -1342,45 +1337,56 @@@ strip numbers instead.
        (if (re-search-forward "\\(tests\\s-*=>\\s-*\\)\\w*" nil t)
  	  (replace-match (format "\\1%d" i))))))
  
- ;;;----- Python programming style -------------------------------------------
+ ;;;--------------------------------------------------------------------------
+ ;;; Python programming style.
  
 -;; Define Python fontification style.
 -
 -(defun mdw-fontify-python ()
 +(defun mdw-fontify-pythonic (keywords)
  
-   ;; --- Miscellaneous fiddling ---
- 
+   ;; Miscellaneous fiddling.
    (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
  
-   ;; --- Now define fontification things ---
- 
+   ;; 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 "\\<\\(" keywords "\\)\\>")
 -	   ;; 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 ---
- 
 -	   ;; 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 ---
- 
 -	   ;; 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 style ---
++;; 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 ---------------------------------------------
+ ;;;--------------------------------------------------------------------------
+ ;;; Icon programming style.
  
- ;; --- Icon indentation style ---
+ ;; Icon indentation style.
  
  (setq icon-brace-offset 0
        icon-continued-brace-offset 0