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://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/782c3e35937e7438daf6073cddafdf21f4fc36fd

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.
---

782c3e35937e7438daf6073cddafdf21f4fc36fd
diff --cc bin/mdw-editor
index 96387e8,2c7535b..aa52fd5
--- a/bin/mdw-editor
+++ b/bin/mdw-editor
@@@ -2,11 -2,13 +2,14 @@@
  
  set -e
  editor=${MDW_EDITOR-ed}
 -emacsclient=t
 +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 --cc dot/emacs
index aa206cf,482e561..b1c5e4b
--- a/dot/emacs
+++ b/dot/emacs
@@@ -87,10 -89,9 +89,9 @@@
  ;; Emacs server behaviour.
  
  (and (or window-system (>= emacs-major-version 23))
 -     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
 -	   (server-start)
 -	   (gnuserv-start)))
 +     (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 +		  gnuserv-frame t)
- 	    (trap (server-start))
- 	    (trap (gnuserv-start))))
++	    (trap (server-start))))
  
  ;; Control backup behaviour.