X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e808c1e5c671ceb9715e0a32e26ea70e95b51f66..502f4699defabcce0ad478ef82e3929d33f3d614:/dot-emacs.el diff --git a/dot-emacs.el b/dot-emacs.el index 4780435..9fe9741 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -1,4 +1,4 @@ -;;; -*-emacs-lisp-*- +;;; -*- mode: emacs-lisp; coding: utf-8 -*- ;;; ;;; $Id$ ;;; @@ -34,7 +34,9 @@ "Execute FORMS without allowing errors to propagate outside." `(condition-case err ,(if (cdr forms) (cons 'progn forms) (car forms)) - (error (message "Error (trapped): %s" (error-message-string err))))) + (error (message "Error (trapped): %s in %s" + (error-message-string err) + ',forms)))) ;; --- Configuration reading --- @@ -79,18 +81,37 @@ path. The non-nil value is the filename we found for the library." ;; --- Splitting windows --- -(defconst mdw-scrollbar-width (if window-system 6 1) - "Guessed width of scroll bar.") +(or (and (fboundp 'scroll-bar-columns) + (fboundp 'fringe-columns)) + (progn + (defun scroll-bar-columns (side) + (cond ((eq side 'left) 0) + (window-system 3) + (t 1))) + (defun fringe-columns (side) + (cond ((not window-system) 0) + ((eq side 'left) 1) + (t 2))))) + (defun mdw-divvy-window (&optional w) "Split a wide window into appropriate widths." (interactive) - (or w (setq w 78)) - (let ((win (selected-window)) - (c (/ (+ (window-width) mdw-scrollbar-width) - (+ w mdw-scrollbar-width)))) + (or w (setq w (if (and window-system + (>= emacs-major-version 22)) + 77 + 78))) + (let* ((win (selected-window)) + (sb-width (if (not window-system) + 1 + (+ (scroll-bar-columns 'left) + (scroll-bar-columns 'right) + (fringe-columns 'left) + (fringe-columns 'right)))) + (c (/ (+ (window-width) sb-width) + (+ w sb-width)))) (while (> c 1) (setq c (1- c)) - (split-window-horizontally (+ w mdw-scrollbar-width)) + (split-window-horizontally (+ w sb-width)) (other-window 1)) (select-window win))) @@ -128,6 +149,19 @@ symbols `sunday', `monday', etc. (or a mixture). If the date stored in ;;;----- Utility functions -------------------------------------------------- +(or (fboundp 'line-number-at-pos) + (defun line-number-at-pos (&optional pos) + (let ((opoint (or pos (point))) start) + (save-excursion + (save-restriction + (goto-char (point-min)) + (widen) + (forward-line 0) + (setq start (point)) + (goto-char opoint) + (forward-line 0) + (1+ (count-lines 1 (point)))))))) + ;; --- mdw-uniquify-alist --- (defun mdw-uniquify-alist (&rest alists) @@ -489,11 +523,14 @@ doesn't cope with anything approximating a complicated case." (and mdw-auto-indent (cond ((eq major-mode 'lisp-mode) (local-set-key "\C-m" 'mdw-indent-newline-and-indent)) - ((eq major-mode 'slime-repl-mode) nil) + ((or (eq major-mode 'slime-repl-mode) + (eq major-mode 'asm-mode)) + nil) (t (local-set-key "\C-m" 'newline-and-indent)))) (local-set-key [C-return] 'newline) - (local-set-key [?\;] 'self-insert-command) + (or (eq major-mode 'asm-mode) + (local-set-key [?\;] 'self-insert-command)) (local-set-key [?\#] 'self-insert-command) (local-set-key [?\"] 'self-insert-command) (setq comment-column 40) @@ -543,11 +580,15 @@ doesn't cope with anything approximating a complicated case." ,@(cond ((eq window-system 'w32) '(:family "courier new" :height 85)) ((eq window-system 'x) - '(:family "misc-fixed" :width semi-condensed)))) - (modeline :foreground "blue" :background "yellow" - :box (:line-width 1 :style released-button)) + '(:family "misc-fixed" :height 130 :width semi-condensed)))) + (fixed-pitch) + (minibuffer-prompt) + (mode-line :foreground "blue" :background "yellow" + :box (:line-width 1 :style released-button)) + (mode-line-inactive :foreground "yellow" :background "blue" + :box (:line-width 1 :style released-button)) (scroll-bar :foreground "black" :background "lightgrey") - (fringe :foreground "yellow" :background "grey30") + (fringe :foreground "yellow" :background "black") (show-paren-match-face :background "darkgreen") (show-paren-mismatch-face :background "red") (font-lock-warning-face :background "red" :weight bold) @@ -638,8 +679,6 @@ doesn't cope with anything approximating a complicated case." (setq c-hanging-comment-ender-p nil) (setq c-backslash-column 72) (setq c-label-minimum-indentation 0) - (setq comment-start "/* ") - (setq comment-end " */") (setq mdw-fill-prefix `((,(concat "\\([ \t]*/?\\)" "\\([\*/][ \t]*\\)" @@ -652,12 +691,12 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((c-keywords (make-regexp '( - ;; "and" ;C++ - ;; "and_eq" ;C++ + "and" ;C++ + "and_eq" ;C++ "asm" ;K&R, GCC "auto" ;K&R, C89 - ;; "bitand" ;C++ - ;; "bitor" ;C++ + "bitand" ;C++ + "bitor" ;C++ "bool" ;C++, C9X macro "break" ;K&R, C89 "case" ;K&R, C89 @@ -665,7 +704,7 @@ doesn't cope with anything approximating a complicated case." "char" ;K&R, C89 "class" ;C++ "complex" ;C9X macro, C++ template type - ;; "compl" ;C++ + "compl" ;C++ "const" ;C89 "const_cast" ;C++ "continue" ;K&R, C89 @@ -679,12 +718,12 @@ doesn't cope with anything approximating a complicated case." ;; "entry" ;K&R -- never used "enum" ;C89 "explicit" ;C++ - ;; "export" ;C++ + "export" ;C++ "extern" ;K&R, C89 "false" ;C++, C9X macro "float" ;K&R, C89 "for" ;K&R, C89 - "fortran" ;K&R + ;; "fortran" ;K&R "friend" ;C++ "goto" ;K&R, C89 "if" ;K&R, C89 @@ -696,8 +735,8 @@ doesn't cope with anything approximating a complicated case." "namespace" ;C++ "new" ;C++ "operator" ;C++ - ;; "or" ;C++ - ;; "or_eq" ;C++ + "or" ;C++ + "or_eq" ;C++ "private" ;C++ "protected" ;C++ "public" ;C++ @@ -730,8 +769,8 @@ doesn't cope with anything approximating a complicated case." "volatile" ;C89 "wchar_t" ;C++, C89 library type "while" ;K&R, C89 - ;; "xor" ;C++ - ;; "xor_eq" ;C++ + "xor" ;C++ + "xor_eq" ;C++ "_Bool" ;C9X "_Complex" ;C9X "_Imaginary" ;C9X @@ -761,7 +800,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Fontify include files as strings --- @@ -842,7 +880,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Handle the keywords defined above --- @@ -917,7 +954,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Handle the keywords defined above --- @@ -998,7 +1034,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Handle the keywords defined above --- @@ -1071,7 +1106,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Handle the keywords defined above --- @@ -1130,7 +1164,6 @@ doesn't cope with anything approximating a complicated case." (setq font-lock-keywords (list - 't ;; --- Set up the keywords defined above --- @@ -1187,7 +1220,6 @@ strip numbers instead." "while" "yield")))) (setq font-lock-keywords (list - 't ;; --- Set up the keywords defined above --- @@ -1266,7 +1298,6 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (setq font-lock-keywords (list - 't ;; --- Handle numbers too --- ;; @@ -1298,6 +1329,14 @@ strip numbers instead." (run-hooks 'arm-assembler-mode-hook)) +;;;----- Assembler mode ----------------------------------------------------- + +(defun mdw-fontify-asm () + (modify-syntax-entry ?' "\"") + (modify-syntax-entry ?. "w") + (setf fill-prefix nil) + (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)")) + ;;;----- TCL configuration -------------------------------------------------- (defun mdw-fontify-tcl () @@ -1306,7 +1345,6 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (setq font-lock-keywords (list - 't (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|" "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)" "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)") @@ -1375,7 +1413,6 @@ strip numbers instead." (setq font-lock-keywords (list - 't ;; --- Set up the keywords defined above --- @@ -1428,7 +1465,6 @@ strip numbers instead." (setq font-lock-keywords (list - 't ;; --- Set up the keywords defined above --- @@ -1479,7 +1515,6 @@ strip numbers instead." (setq font-lock-keywords (list - 't (list "--.*$" '(0 font-lock-comment-face)) (list (concat "\\<\\(" haskell-keywords "\\)\\>") @@ -1504,7 +1539,6 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (setq font-lock-keywords (list - 't ;; --- Environment names are keywords --- @@ -1552,7 +1586,6 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (setq font-lock-keywords (list - 't ;; --- Environment names are keywords --- @@ -1610,6 +1643,26 @@ strip numbers instead." (list "[$^_{}#&]" '(0 mdw-punct-face))))) +;;;----- SGML hacking ------------------------------------------------------- + +(defun mdw-sgml-mode () + (interactive) + (sgml-mode) + (mdw-standard-fill-prefix "") + (make-variable-buffer-local 'sgml-delimiters) + (setq sgml-delimiters + '("AND" "&" "COM" "--" "CRO" "&#" "DSC" "]" "DSO" "[" "DTGC" "]" + "DTGO" "[" "ERO" "&" "ETAGO" ":e" "GRPC" ")" "GRPO" "(" "LIT" "\"" + "LITA" "'" "MDC" ">" "MDO" "" "PIO" "" + "XML-ECOM" "-->" "XML-PIC" "?>" "XML-SCOM" "