From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 7 Dec 2009 09:45:50 +0000 (+0000)
Subject: Merge commit 'origin'
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/782c3e35937e7438daf6073cddafdf21f4fc36fd?hp=07965a3978b656cabc38cbac52fde1ed17dd8332

Merge commit 'origin'

* commit 'origin':
  el/dot-emacs.el: Make my writing be legible in ERC.
  bin/mdw-{editor,pager}: Recognize other Emacs terminal types.
  el/dot-emacs.el: Restore `gtags' mouse bindings.
  dot/emacs: Some Perforce tweaks.
  el/dot-emacs.el: Various bits of minor face hacking.
  el/dot-emacs.el: Force an update of the screen when setting faces.
  el/dot-emacs.el: Add `strayman' support at the right time.
  dot/emacs: Fix command to start the server.

Conflicts:
	dot/emacs
	el/dot-emacs.el

Resolved by removing gnuclient altogether.  Now it's Emacsclient only.
---

diff --git a/bin/mdw-editor b/bin/mdw-editor
index 96387e8..aa52fd5 100755
--- a/bin/mdw-editor
+++ b/bin/mdw-editor
@@ -6,7 +6,10 @@ emacsclient=$(
   emacsclient --eval '(>= emacs-major-version 23)' 2>/dev/null || :)
 [ -t 0 -a -t 1 ] || TERM=dumb
 case "$EDITOR,$VISUAL,$TERM" in
-  mdw-editor,mdw-editor,dumb) editor=emacsclient emacsclient=nil;;
+  mdw-editor,mdw-editor,dumb | \
+    mdw-editor,mdw-editor,emacs | \
+    mdw-editor,mdw-editor,eterm*)
+    editor=emacsclient emacsclient=nil;;
   mdw-editor,mdw-editor,*);;
   mdw-editor,*,*) editor=$VISUAL;;
   *,*,*) editor=$EDITOR;;
diff --git a/bin/mdw-pager b/bin/mdw-pager
index cd59476..1a9744b 100755
--- a/bin/mdw-pager
+++ b/bin/mdw-pager
@@ -4,7 +4,10 @@ set -e
 pager=${MDW_PAGER-less}
 [ -t 1 ] || TERM=dumb
 case "$PAGER,$TERM" in
-  mdw-pager,dumb) pager=cat;;
+  mdw-pager,dumb | \
+    mdw-pager,emacs | \
+    mdw-pager,eterm*)
+    pager=cat;;
   mdw-pager,*);;
   *,*) pager=$PAGER;;
 esac
diff --git a/dot/emacs b/dot/emacs
index aa206cf..b1c5e4b 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -59,6 +59,8 @@
      (not mdw-fast-startup)
      (load "quilt"))
 
+(trap (or mdw-fast-startup (require 'p4)))
+
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
@@ -89,8 +91,7 @@
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  gnuserv-frame t)
-	    (trap (server-start))
-	    (trap (gnuserv-start))))
+	    (trap (server-start))))
 
 ;; Control backup behaviour.
 
@@ -727,8 +728,8 @@
 
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
 (setq comint-password-prompt-regexp
-      (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-	      "[Pp]assword\\|pass phrase\\):\\s *\\'"))
+      (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
+	      "[Pp]assword\\|pass phrase\\):"))
 
 ;; Notice passwords, and make C-a work right.
 
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 7bb8214..404233b 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -233,7 +233,7 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 	(dolist (key replacements)
 	  (define-key keymap key binding))))))
 
-(eval-after-load "org"
+(eval-after-load "org-latex"
   '(progn
      (push '("strayman"
 	     "\\documentclass{strayman}
@@ -690,8 +690,14 @@ case."
   (trap (turn-on-font-lock)))
 
 (eval-after-load 'gtags
-  '(dolist (key '([mouse-2] [mouse-3]))
-     (define-key gtags-mode-map key nil)))
+  '(progn
+     (dolist (key '([mouse-2] [mouse-3]))
+       (define-key gtags-mode-map key nil))
+     (define-key gtags-mode-map [C-S-mouse-2] 'gtags-find-tag-by-event)
+     (define-key gtags-select-mode-map [C-S-mouse-2]
+       'gtags-select-tag-by-event)
+     (dolist (map (list gtags-mode-map gtags-select-mode-map))
+       (define-key map [C-S-mouse-3] 'gtags-pop-stack))))
 
 ;; Backup file handling.
 
@@ -742,7 +748,8 @@ doesn't match any of the regular expressions in
   `(progn
      (make-face ',name)
      (defvar ,name ',name)
-     (put ',name 'face-defface-spec ',body)))
+     (put ',name 'face-defface-spec ',body)
+     (face-spec-set ',name ',body nil)))
 
 (mdw-define-face default
   (((type w32)) :family "courier new" :height 85)
@@ -752,6 +759,11 @@ doesn't match any of the regular expressions in
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :height 130)
   (t :foreground "white" :background "black"))
+(if (>= emacs-major-version 23)
+    (mdw-define-face variable-pitch
+      (((type x)) :family "sans" :height 100))
+  (mdw-define-face variable-pitch
+    (((type x)) :family "helvetica" :height 120)))
 (mdw-define-face region
   (((type tty)) :background "blue") (t :background "grey30"))
 (mdw-define-face minibuffer-prompt
@@ -766,9 +778,9 @@ doesn't match any of the regular expressions in
   (t :foreground "black" :background "lightgrey"))
 (mdw-define-face fringe
   (t :foreground "yellow"))
-(mdw-define-face show-paren-match-face
+(mdw-define-face show-paren-match
   (t :background "darkgreen"))
-(mdw-define-face show-paren-mismatch-face
+(mdw-define-face show-paren-mismatch
   (t :background "red"))
 (mdw-define-face highlight
   (t :background "DarkSeaGreen4"))
@@ -790,7 +802,7 @@ doesn't match any of the regular expressions in
 (mdw-define-face mdw-number-face
   (t :foreground "yellow"))
 (mdw-define-face font-lock-function-name-face
-  (t :weight bold))
+  (t :slant italic))
 (mdw-define-face font-lock-keyword-face
   (t :weight bold))
 (mdw-define-face font-lock-constant-face
@@ -854,6 +866,9 @@ doesn't match any of the regular expressions in
   (t :foreground "red"))
 (mdw-define-face diff-context)
 
+(mdw-define-face erc-input-face
+  (t :foreground "red"))
+
 (mdw-define-face woman-bold
   (t :weight bold))
 (mdw-define-face woman-italic