# HG changeset patch
# User Henry S. Thompson <ht@inf.ed.ac.uk>
# Date 1700692651 0
# Node ID fc30f30d88d70dfc2d78b450b892d637322bb480
# Parent  642211cbf13a840882b12752e354591e877a895c# Parent  ce8241eb1d618e32f1e856dcbfdca153ee90e5c3
refill and merge

diff -r ce8241eb1d61 -r fc30f30d88d7 common-init.el
Binary file common-init.el has changed
diff -r ce8241eb1d61 -r fc30f30d88d7 pers-init.el
--- a/pers-init.el	Wed Nov 22 22:23:36 2023 +0000
+++ b/pers-init.el	Wed Nov 22 22:37:31 2023 +0000
@@ -20,10 +20,10 @@
 ;;; mail stuff
 (site-caseq (edin
 	     (setq mail-archive-file-name (concat "/disk/scratch/mail/cpy/general/"
-				     (format-time-string
-				      "%Y-%m" (current-time))
-				     ".mbox")))
-	     (t (setq mail-archive-file-name "~/mail/cpy/general")))
+						  (format-time-string
+						   "%Y-%m" (current-time))
+						  ".mbox")))
+	    (t (setq mail-archive-file-name "~/mail/cpy/general")))
 
 
 (setq rmail-dont-reply-to-names "hthompso*\\|h\\.thompso*\\|ht@*" )
@@ -221,30 +221,20 @@
 				  (interactive "e")
 				  (mouse-set-point click)
 				  (dired-advertised-find-file)))))
-	  (set-face-background 'modeline '((x) . "lightgrey"))
-	  ))
+	  (set-face-background 'modeline '((x) . "lightgrey"))))
     ;; DICE comes here 2012-01-13
     (load "device-type-hacking" t t)
+    ;; override changed default, except in gnus
     (message "dth")
     (site-caseq (edin
+		 (setq highlight-headers-follow-url-function
+		       'browse-url-firefox
+		       )
+		 (setq browse-url-browser-function 'browse-url-firefox)
 		 (defun ht-rooms-setup (&optional arg)
 		   (interactive)
 		   (require 'mail-extras)
 		   (require 'diary)
-		   ;; override changed default, except in gnus
-		   (setq mail-use-rfc822 nil)
-		   (add-hook 'gnus-summary-mode-hook
-			     (function (lambda ()
-					 (make-local-variable 'mail-use-rfc822)
-					 (setq mail-use-rfc822 t))))
-		   (if (>= emacs-major-version 21)
-		       (progn
-			 (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus)
-			 (add-hook 'gnus-startup-hook 'bbdb-insinuate-message)))
-		   (defun ht-rooms-setup (&optional arg)
-		     (interactive)
-		     (require 'mail-extras)
-		     (require 'diary)
 		     (let ((scr (selected-frame)))
 					;	    (sit-for 5)
 		       (load "ht-rooms.config" nil t)
@@ -258,11 +248,10 @@
 		       (sit-for 1)
 		       (delete-screen scr))
 		     (setq ht-default-config (current-window-configuration)))))
-		)
-  (message "gnus-init")
-  (site-caseq ((edin markup maritain)
-	       (require 'gnus-init)))
-  )
+    (message "gnus-init")
+    (site-caseq ((edin markup maritain)
+		 (require 'gnus-init)))
+    )
   ;; vanilla v19 goes here
   ;; probably stale/broken
   (message "vanilla")
@@ -333,46 +322,28 @@
 				(dired-advertised-find-file)))))
 
 	(defun ht-rooms-setup (&optional arg)
-	  (interactive)
-	  (require 'mail-extras)
-	  (require 'diary)
-	  (require 'my-news)
-	  ;; override changed default, except in gnus
-	  (setq mail-use-rfc822 nil)
-	  (add-hook 'gnus-summary-mode-hook
-		    (function (lambda ()
-				(make-local-variable 'mail-use-rfc822)
-				(setq mail-use-rfc822 t))))
-	  (let ((scr (selected-frame)))
-	    (load "ht-rooms.config" nil t)
-	    (unwind-protect (make-frame-for-room "elisp" "-25" "-58"))
-	    (unwind-protect (progn
-			      (make-frame-for-room "news" "-50" "-40")
-			      ))
-	    (unwind-protect (progn
-			      (make-frame-for-room "mail" "-75" "-22")
-			      ))
-	    (unwind-protect (progn
-			      (make-frame-for-room
-			       "diary"
-			       "-0"
-			       (concat
-				"+"
-				(format
-				 "%d"
-				 (-
-				  (cdr
-				   (assoc
-				    'top
-				    (frame-parameters
-				     (cdr
-				      (assoc
-				       "elisp"
-				       frames-table)))))
-				  18))))
-			      ))
-	    (make-frame-invisible scr))
-	  (setq ht-default-config (current-window-configuration))))))
+	      (interactive)
+	      (require 'mail-extras)
+	      (require 'diary)
+	      (let ((scr (selected-frame)))
+					;	    (sit-for 5)
+		(load "ht-rooms.config" nil t)
+		;; for ecclerig viewed from paul
+		(if (eq (device-pixel-width (selected-device)) 1920)
+		    (progn
+		      (unwind-protect
+			  (make-screen-for-room "diary" "+1219" "+68"))
+		      (unwind-protect
+			  (make-screen-for-room "elisp" "+1185" "+102"))
+		      (unwind-protect
+			  (make-screen-for-room "news" "+1253" "+34")))
+		  ;; for ecclerig in office
+		  (unwind-protect (make-screen-for-room "diary" "+1888" "+0"))
+		  (unwind-protect (make-screen-for-room "elisp" "+1888" "+0"))
+		  (unwind-protect (make-screen-for-room "news" "+1223" "+0")))
+		(sit-for 1)
+		(delete-frame scr))
+	      (setq ht-default-config (current-window-configuration))))))
 (setq sgml-insert-missing-element-comment nil)
 (load "psgml" nil t)
 (load "psgml-edit" nil t)