From: Mark Wooding Date: Fri, 23 Oct 2009 15:46:12 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/ad191f4eb0a643961acfd7cee6e558fef9236eab?ds=sidebyside;hp=-c Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile * 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile: dot/fonts.conf: Prevent finding of Fixed Normal. dot/mailrc: Parents changed email addresses again. bg/bsg-supper: Galactica backdrop of win. dot/emacs, el/dot-emacs.el: Fontification for Pyrex code. el/dot-emacs.el: Turn electric star and slash back on. dot/emacs: Put semantic's droppings somewhere central. e16-bindings: Move conservative-maximize bindings off S5. dot/e16-bindings: Make 5-F6 toggle keyboard mouse control. Go back to xscreensaver. Mostly. --- ad191f4eb0a643961acfd7cee6e558fef9236eab diff --combined dot/e16-bindings index 143ae43,45493bc..c2cf4be --- a/dot/e16-bindings +++ b/dot/e16-bindings @@@ -4,7 -4,6 +4,7 @@@ MouseDouble CA 1 wop * shad MouseDown CA 2 wop * sz ptr MouseDouble CA 2 wop * th available MouseDown CA 3 menus show winops.menu +MouseDown C5 3 menus show windowlist Aclass DESKBINDINGS normal Tooltip Clicking your mouse on the desktop will perform Tooltip the following actions @@@ -29,11 -28,12 +29,12 @@@ Tooltip Go Back a Deskto MouseDown * 5 desk next Tooltip Go Forward a Desktop Aclass KEYBINDINGS global + KeyDown 5 F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable KeyDown 5 F7 exec un-backslashify-selection KeyDown 5 F8 exec xatom set XINIT_COMMAND :terminal KeyDown 5 F9 exec xatom set XINIT_COMMAND :ask-run KeyDown 5 F10 exec xatom set XINIT_COMMAND :ask-command - KeyDown 5 F11 exec gnome-screensaver-command --lock + KeyDown 5 F11 exec lock-screen KeyDown 5 F12 exec xshutdown KeyDown 5 Tab focus next KeyDown 5 plus desk next @@@ -57,9 -57,9 +58,9 @@@ KeyDown C5 F4 menus show window 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 --combined el/dot-emacs.el index f7cadd9,41e15d3..1322789 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@@ -229,21 -229,6 +229,21 @@@ Evil key bindings are defined in `mdw-e (dolist (key replacements) (define-key keymap key binding)))))) +(eval-after-load "org" + '(progn + (push '("strayman" + "\\documentclass{strayman} +\\usepackage[utf8]{inputenc} +\\usepackage[palatino, helvetica, courier, maths=cmr]{mdwfonts} +\\usepackage[T1]{fontenc} +\\usepackage{graphicx, tikz, mdwtab, mdwmath, crypto, longtable}" + ("\\section{%s}" . "\\section*{%s}") + ("\\subsection{%s}" . "\\subsection*{%s}") + ("\\subsubsection{%s}" . "\\subsubsection*{%s}") + ("\\paragraph{%s}" . "\\paragraph*{%s}") + ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) + org-export-latex-classes))) + ;;;-------------------------------------------------------------------------- ;;; Mail and news hacking. @@@ -822,11 -807,6 +822,6 @@@ doesn't match any of the regular expres ;; 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 @@@ -1229,8 -1209,13 +1224,8 @@@ (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" '(0 mdw-punct-face)))))) -(defun csharp-mode () - (interactive) - (java-mode) - (setq major-mode 'csharp-mode) - (setq mode-name "C#") - (mdw-fontify-csharp) - (run-hooks 'csharp-mode-hook)) +(define-derived-mode csharp-mode java-mode "C#" + "Major mode for editing C# code.") ;;;-------------------------------------------------------------------------- ;;; Awk programming configuration. @@@ -1355,37 -1340,48 +1350,48 @@@ strip numbers instead. ;;;-------------------------------------------------------------------------- ;;; 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.