X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4983780af98c0465162b06554cd55ffcd213cfcd..8a425bd7802fb5bcda35025495d7e70b561769ff:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 4969f29..e08b6fc 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -418,6 +418,21 @@ in REST."
 	      (insert "\nNP: ")
 	      (insert-file-contents np-file)))))
 
+(defun mdw-version-< (ver-a ver-b)
+  "Answer whether VER-A is strictly earlier than VER-B.
+VER-A and VER-B are version numbers, which are strings containing digit
+sequences separated by `.'."
+  (let* ((la (mapcar (lambda (x) (car (read-from-string x)))
+		     (split-string ver-a "\\.")))
+	 (lb (mapcar (lambda (x) (car (read-from-string x)))
+		     (split-string ver-b "\\."))))
+    (catch 'done
+      (while t
+	(cond ((null la) (throw 'done lb))
+	      ((null lb) (throw 'done nil))
+	      ((< (car la) (car lb)) (throw 'done t))
+	      ((= (car la) (car lb)) (setq la (cdr la) lb (cdr lb))))))))
+
 (defun mdw-check-autorevert ()
   "Sets global-auto-revert-ignore-buffer appropriately for this buffer.
 This takes into consideration whether it's been found using
@@ -675,7 +690,7 @@ case."
 	     (t
 	      (local-set-key "\C-m" 'newline-and-indent))))
   (local-set-key [C-return] 'newline)
-  (make-variable-buffer-local 'page-delimiter)
+  (make-local-variable 'page-delimiter)
   (setq page-delimiter "\f\\|^.*-\\{6\\}.*$")
   (setq comment-column 40)
   (auto-fill-mode 1)
@@ -2026,7 +2041,7 @@ strip numbers instead."
   (interactive)
   (sgml-mode)
   (mdw-standard-fill-prefix "")
-  (make-variable-buffer-local 'sgml-delimiters)
+  (make-local-variable 'sgml-delimiters)
   (setq sgml-delimiters
 	'("AND" "&" "COM" "--" "CRO" "&#" "DSC" "]" "DSO" "[" "DTGC" "]"
 	  "DTGO" "[" "ERO" "&" "ETAGO" ":e" "GRPC" ")" "GRPO" "(" "LIT" "\""
@@ -2081,7 +2096,7 @@ strip numbers instead."
 	    (eshell/pwd)
 	    right)))
 (setq eshell-prompt-function 'mdw-eshell-prompt)
-(setq eshell-prompt-regexp "^\\[[^]]+\\]")
+(setq eshell-prompt-regexp "^\\[[^]>]+\\(\\]\\|>>?\\)")
 
 (defalias 'eshell/e 'find-file)
 (defalias 'eshell/w3m 'w3m-goto-url)
@@ -2283,7 +2298,7 @@ strip numbers instead."
 (defun mdw-setup-smalltalk ()
   (and mdw-auto-indent
        (local-set-key "\C-m" 'smalltalk-newline-and-indent))
-  (make-variable-buffer-local 'mdw-auto-indent)
+  (make-local-variable 'mdw-auto-indent)
   (setq mdw-auto-indent nil)
   (local-set-key "\C-i" 'smalltalk-reindent))
 
@@ -2322,7 +2337,7 @@ strip numbers instead."
 	(multiple-value-bind . ((&whole 4 &rest 1) 4 &body))))))
 
 (defun mdw-common-lisp-indent ()
-  (make-variable-buffer-local 'lisp-indent-function)
+  (make-local-variable 'lisp-indent-function)
   (setq lisp-indent-function 'common-lisp-indent-function))
 
 (setq lisp-simple-loop-indentation 2