Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile

* 'master' of https://git.distorted.org.uk/~mdw/profile:
  dot/gnus.el, dot/gnus-local.el.distorted: Fancy mail sending.
  dot/emacs: I have another chiark email address now.
  dot/gnus-local.el.distorted (gnus-posting-styles): Set address better.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

diff --git a/dot/emacs b/dot/emacs
index 2f347d6648f503dbe878d5cd8ab21057b302b2b5..65b5e8a42a4e609667eacacb88fc5e0b9bda165b 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -346,7 +346,10 @@
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
   (setq uniquify-after-kill-buffer-p t))
 (transient-mark-mode t)
-(setq mark-even-if-inactive t)
+(setq mark-even-if-inactive t
+      shift-select-mode nil
+      delete-active-region nil
+      delete-selection-mode nil)
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))

diff --git a/dot/xinitrc b/dot/xinitrc
index b44bc816fd3a6afa245ec7464eccc1e035dcb19d..226b87da056dc8384e1ea7a63252a064aba1c4e6 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -216,7 +216,8 @@ start-clients () {
 ### Main screen layout.
 
 ## Choose appropriate clients.
-emacs=$(pick_program emacs emacs23 emacs24 emacs22 emacs21 emacs)
+emacs=$(pick_program emacs \
+  emacs23-lucid emacs24-lucid emacs23 emacs24 emacs22 emacs21 emacs)
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
@@ -248,6 +249,11 @@ case "$emacs" in
     e_colchars=82 e_cextra=-6
     e_lineht=13 e_vextra=42
     ;;
+  emacs2[34]-lucid)
+    e_colwd=492 e_hextra=7
+    e_colchars=82 e_cextra=-5
+    e_lineht=13 e_vextra=48
+    ;;
 esac
 
 ## Terminal window measurements.