X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b8c659bb0964f68e8a2e88fe0b0621a08140a680..20b6cd68765b7502483e411dea6c75f455c6f808:/el/dot-emacs.el?ds=sidebyside

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 1be5746..dcbaa78 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -200,13 +200,16 @@ fringes is not taken out of the allowance for WIDTH, unlike
 	 ((>= width 0) (+ width (mdw-horizontal-window-overhead)))
 	 ((< width 0) width))))
 
+(defun mdw-preferred-column-width ()
+  "Return the preferred column width."
+  (if (and window-system (mdw-emacs-version-p 22)) mdw-column-width
+    (1+ mdw-column-width)))
+
 (defun mdw-divvy-window (&optional width)
   "Split a wide window into appropriate widths."
   (interactive "P")
-  (setq width (cond (width (prefix-numeric-value width))
-		    ((and window-system (mdw-emacs-version-p 22))
-		     mdw-column-width)
-		    (t (1+ mdw-column-width))))
+  (setq width (if width (prefix-numeric-value width)
+		(mdw-preferred-column-width)))
   (let* ((win (selected-window))
 	 (sb-width (mdw-horizontal-window-overhead))
 	 (c (/ (+ (window-width) sb-width)
@@ -220,10 +223,8 @@ fringes is not taken out of the allowance for WIDTH, unlike
 (defun mdw-set-frame-width (columns &optional width)
   (interactive "nColumns: 
 P")
-  (setq width (cond (width (prefix-numeric-value width))
-		    ((and window-system (mdw-emacs-version-p 22))
-		     mdw-column-width)
-		    (t (1+ mdw-column-width))))
+  (setq width (if width (prefix-numeric-value width)
+		(mdw-preferred-column-width)))
   (let ((sb-width (mdw-horizontal-window-overhead)))
     (set-frame-width (selected-frame)
 		     (- (* columns (+ width sb-width))
@@ -470,20 +471,40 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 	(dolist (key replacements)
 	  (define-key keymap key binding))))))
 
-(eval-after-load "org-latex"
-  '(progn
-     (push '("strayman"
-	     "\\documentclass{strayman}
+(defvar mdw-org-latex-defs
+  '(("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)))
+     ("\\section{%s}" . "\\section*{%s}")
+     ("\\subsection{%s}" . "\\subsection*{%s}")
+     ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+     ("\\paragraph{%s}" . "\\paragraph*{%s}")
+     ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))))
+
+(eval-after-load "org-latex"
+  '(setq org-export-latex-classes
+	 (append mdw-org-latex-defs org-export-latex-classes)))
+
+(eval-after-load "ox-latex"
+  '(setq org-latex-classes (append mdw-org-latex-defs org-latex-classes)
+	 org-latex-default-packages-alist '(("AUTO" "inputenc" t)
+					    ("T1" "fontenc" t)
+					    ("" "fixltx2e" nil)
+					    ("" "graphicx" t)
+					    ("" "longtable" nil)
+					    ("" "float" nil)
+					    ("" "wrapfig" nil)
+					    ("" "rotating" nil)
+					    ("normalem" "ulem" t)
+					    ("" "textcomp" t)
+					    ("" "marvosym" t)
+					    ("" "wasysym" t)
+					    ("" "amssymb" t)
+					    ("" "hyperref" nil)
+					    "\\tolerance=1000")))
+
 
 (setq org-export-docbook-xslt-proc-command "xsltproc --output %o %s %i"
       org-export-docbook-xsl-fo-proc-command "fop %i.safe %o"
@@ -730,7 +751,79 @@ Use this to arrange for per-server settings.")
     proc))
 
 (eval-after-load "erc"
-    '(load "~/.ercrc.el"))
+  '(load "~/.ercrc.el"))
+
+;; Heavy-duty Gnus patching.
+
+(defun mdw-nnimap-transform-headers ()
+  (goto-char (point-min))
+  (let (article lines size string)
+    (block nil
+      (while (not (eobp))
+	(while (not (looking-at "\\* [0-9]+ FETCH"))
+	  (delete-region (point) (progn (forward-line 1) (point)))
+	  (when (eobp)
+	    (return)))
+	(goto-char (match-end 0))
+	;; Unfold quoted {number} strings.
+	(while (re-search-forward
+		"[^]][ (]{\\([0-9]+\\)}\r?\n"
+		(save-excursion
+		  ;; Start of the header section.
+		  (or (re-search-forward "] {[0-9]+}\r?\n" nil t)
+		      ;; Start of the next FETCH.
+		      (re-search-forward "\\* [0-9]+ FETCH" nil t)
+		      (point-max)))
+		t)
+	  (setq size (string-to-number (match-string 1)))
+	  (delete-region (+ (match-beginning 0) 2) (point))
+	  (setq string (buffer-substring (point) (+ (point) size)))
+	  (delete-region (point) (+ (point) size))
+	  (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string)))
+	  ;; [mdw] missing from upstream
+	  (backward-char 1))
+	(beginning-of-line)
+	(setq article
+	      (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position)
+				      t)
+		   (match-string 1)))
+	(setq lines nil)
+	(setq size
+	      (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)"
+				      (line-end-position)
+				      t)
+		   (match-string 1)))
+	(beginning-of-line)
+	(when (search-forward "BODYSTRUCTURE" (line-end-position) t)
+	  (let ((structure (ignore-errors
+			     (read (current-buffer)))))
+	    (while (and (consp structure)
+			(not (atom (car structure))))
+	      (setq structure (car structure)))
+	    (setq lines (if (and
+			     (stringp (car structure))
+			     (equal (upcase (nth 0 structure)) "MESSAGE")
+			     (equal (upcase (nth 1 structure)) "RFC822"))
+			    (nth 9 structure)
+			  (nth 7 structure)))))
+	(delete-region (line-beginning-position) (line-end-position))
+	(insert (format "211 %s Article retrieved." article))
+	(forward-line 1)
+	(when size
+	  (insert (format "Chars: %s\n" size)))
+	(when lines
+	  (insert (format "Lines: %s\n" lines)))
+	;; Most servers have a blank line after the headers, but
+	;; Davmail doesn't.
+	(unless (re-search-forward "^\r$\\|^)\r?$" nil t)
+	  (goto-char (point-max)))
+	(delete-region (line-beginning-position) (line-end-position))
+	(insert ".")
+	(forward-line 1)))))
+
+(eval-after-load 'nnimap
+  '(defalias 'nnimap-transform-headers
+     (symbol-function 'mdw-nnimap-transform-headers)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Utility functions.
@@ -920,7 +1013,8 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-mozilla
+  '(browse-url-chromium
+    browse-url-mozilla
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
@@ -3374,6 +3468,9 @@ strip numbers instead."
 	   (unless modified
 	     (restore-buffer-modified-p nil)))))))
 
+(setq LaTeX-syntactic-comments nil
+      LaTeX-fill-break-at-separators '(\\\[))
+
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.
 
@@ -3909,7 +4006,7 @@ This allows you to pass a list of arguments through `ansi-term'."
   (ansi-term (list "ssh" host) (format "ssh@%s" host)))
 
 (defvar git-grep-command
-  "env PAGER=cat git grep --no-color -nH -e "
+  "env GIT_PAGER=cat git grep --no-color -nH -e "
   "*The default command for \\[git-grep].")
 
 (defvar git-grep-history nil)
@@ -3919,7 +4016,8 @@ This allows you to pass a list of arguments through `ansi-term'."
   (interactive
    (list (read-shell-command "Run git grep (like this): "
 			     git-grep-command 'git-grep-history)))
-  (grep command-args))
+  (let ((grep-use-null-device nil))
+    (grep command-args)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Magit configuration.