exit 1
}
+warn () {
+ case $build in
+ release) fail "$*" ;;
+ *) notify 5 "??? $*" ;;
+ esac
+}
+
info () {
notify 6 "--- $*"
}
;;
esac
-## Maybe check out a copy of the source.
+## Do we have a Git repository?
case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in
yes,no,*)
fail "Inconsistent options: can't check out without setup."
;;
yes,yes,no)
info "No Git repository found."
+ checkout=no gitver=none
;;
yes,yes,yes)
cd $srcpath
[ "$(git ls-files -m)" = "" ] ||
- fail "working tree has uncommitted changes"
+ warn "working tree has uncommitted changes"
+ gitver=$(git describe)
+esac
+
+## Is there Debian build equipment?
+case "$debian,$(yesno [ -d $srcpath/debian ])" in
+ yes,no)
+ info "No debian directory found."
+ debian=no debver=none
+ ;;
+ yes,yes)
+ debver=$(dpkg-parsechangelog | sed -n 's/^Version: //p')
+ ;;
+esac
+
+## Check the version number.
+case "$gitver,$debver" in
+ none,* | *,none)
+ ;;
+ *)
+ [ "$gitver" = "$debver" ] ||
+ warn "Git version $gitver doesn't match Debian version $debver"
+ ;;
+esac
+
+## Maybe check ot a copy of the source.
+case "$checkout" in
+ yes)
cd $releasepath
run git clone -sn $srcpath/.git _source
assign srcpath $releasepath/_source
run mv $buildpath/$distdir.tar.gz .
## Maybe build the Debian packages.
-case "$debian,$(yesno [ -d $srcpath/debian ])" in
- yes,no)
- info "No debian directory found."
- debian=no
- ;;
- yes,yes)
+case "$debian" in
+ yes)
run tar xvfz $distdir.tar.gz
cd $distdir
run dpkg-buildpackage -k$(mdw-conf releasekey)
Emacs.pane.menubar.font: NICEFONT
Emacs.menu*.font: NICEFONT
Emacs.font: FIXED
+Emacs.fontBackend: x,xft
Emacs.cursorColor: red
Emacs.bitmapIcon: true
Emacs*foreground: white
(and (library-exists-p "vc-git")
(not (memq 'GIT vc-handled-backends))
(not (memq 'Git vc-handled-backends))
+ (not (memq 'git vc-handled-backends))
(setq vc-handled-backends (cons 'GIT vc-handled-backends)))
(trap (or mdw-fast-startup (require 'p4)))
(setq sendmail-program "~/bin/sendmail-hack")
-(setq mail-user-agent 'message-user-agent)
+(setq mail-user-agent 'message-user-agent
+ read-mail-command 'gnus)
(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
message-yank-prefix "> "
message-yank-cited-prefix "> "
(trap (resize-minibuffer-mode 1)) ;Make minibuffer grow dynamically
(auto-compression-mode 1) ;Enable automatic compression
+(setq enable-local-variables :safe
+ enable-local-eval nil)
(setq dabbrev-case-replace nil) ;Retain case when completing
+(setq linum-format "%7d ")
(setq next-line-add-newlines nil) ;Don't add weird newlines
(setq split-height-threshold 45) ;Reuse windows where sensible
(setq display-buffer-reuse-frames nil ;Don't confuse me by showing buffers
iswitchb-default-method 'samewindow) ;in other random frames
(setq dired-deletion-confirmer ;Make deletion easier in dired
- (symbol-function 'y-or-n-p))
+ (symbol-function 'y-or-n-p)
+ dired-listing-switches "-alF" ;Do `ls -F' things in dired windows
+ wdired-allow-to-change-permissions 'advanced)
(setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET]
-(setq dired-listing-switches "-alF") ;Do `ls -F' things in dired windows
-(setq wdired-allow-to-change-permissions t)
(setq case-fold-file-names nil) ;Don't translate file names (grr...)
(setq scroll-step 5) ;Don't scroll too much at a time
(setq-default fill-column 77) ;I use rather narrow windows
(setq x-gtk-file-dialog-help-text nil)
(setq Info-fontify-maximum-menu-size 100000)
(setq set-mark-command-repeat-pop t)
+(setq password-cache-expiry nil)
(setq-default proced-filter 'all
proced-sort 'user)
(setq ispell-program-name "aspell"
(setq display-time-24hr-format t)
(display-time)
+(column-number-mode 1)
(trap
(if window-system
(let ((view-diary-entries-initially t))
(cursor-color . "red"))
(if mdw-black-background
'((background-mode . dark))
- '((background-mode . light)))
- (and (eq window-system 'pm)
- '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
- (menu-font . "8.Helv")
- (background-color . "lightgrey")))
- default-frame-alist))
+ '((background-mode . light)))))
+(setq window-system-default-frame-alist
+ '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+ (menu-font . "8.Helv")
+ (background-color . "lightgrey"))
+ (nil (menu-bar-lines . 0))))
;; Other frame fiddling.
(eval-after-load "dired"
'(progn
- (define-key dired-mode-map [?\C-x ?\C-q]
- 'wdired-change-to-wdired-mode)))
+ (or (lookup-key dired-mode-map [?\C-x ?\C-q])
+ (define-key dired-mode-map [?\C-x ?\C-q]
+ 'wdired-change-to-wdired-mode))
+ (and (fboundp 'dired-do-relsymlink)
+ (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
(add-hook 'org-mode-hook
#'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
(add-hook 'org-agenda-mode-hook
#'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
+(or mdw-fast-startup
+ (progn
+ (org-remember-insinuate)
+ (global-set-key [?\C-c ?r] 'org-remember)))
;; Recognising types of files.
;;; Rootly editingness.
(eval-after-load "tramp"
- '(progn
+ '(let ((fix-args (if (mdw-version-< tramp-version "2.1")
+ #'append #'list)))
(setq tramp-methods
(mdw-uniquify-alist
`(("become"
(tramp-copy-program nil)
(tramp-copy-args nil)
(tramp-copy-keep-date-arg nil)
- (tramp-login-args (("TERM=dumb" "%u"))))
+ (tramp-login-args ,(funcall fix-args `("TERM=dumb" "%u"))))
("really"
(tramp-connection-function tramp-open-connection-su)
(tramp-login-program "really")
- (tramp-login-args (("-u" "%u")
- ("--")
- ("env" "TERM=dumb" "/bin/sh")))
+ (tramp-login-args ,(funcall fix-args
+ `("-u" "%u")
+ `("--")
+ `("env" "TERM=dumb" "/bin/sh")))
(tramp-copy-program nil)
(tramp-copy-args nil)
(tramp-copy-keep-date-arg nil)
,@tramp-methods)))
(setq tramp-default-method "ssh")
(setq tramp-default-method-alist
- `(("\\`localhost\\'" ""
+ `(("\\`\\(localhost\\|\\)\\'" ""
,(cond ((executable-find "become") "become")
((executable-find "really") "really")
(t "su")))))))
;; Make the shell mode aware of my prompt.
-(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
(setq comint-password-prompt-regexp
(concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
"[Pp]assword\\|pass phrase\\):"))
(other-window 1))
(select-window win)))
+;; Transient mark mode hacks.
+
+(defadvice exchange-point-and-mark
+ (around mdw-highlight (&optional arg) activate compile)
+ "Maybe don't actually exchange point and mark.
+If `transient-mark-mode' is on and the mark is inactive, then
+just activate it. A non-trivial prefix argument will force the
+usual behaviour. A trivial prefix argument (i.e., just C-u) will
+activate the mark and temporarily enable `transient-mark-mode' if
+it's currently off."
+ (cond ((or mark-active
+ (and (not transient-mark-mode) (not arg))
+ (and arg (or (not (consp arg))
+ (not (= (car arg) 4)))))
+ ad-do-it)
+ (t
+ (or transient-mark-mode (setq transient-mark-mode 'only))
+ (set-mark (mark t)))))
+
;; Functions for sexp diary entries.
(defun mdw-weekday (l)
(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
(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)
(run-with-idle-timer 0 nil #'x-close-connection frame-display))))
(add-hook 'delete-frame-functions 'mdw-last-one-out-turn-off-the-lights)
-(defvar mdw-frame-parameters-alist
- '((nil (menu-bar-lines . 0))))
-(defun mdw-set-frame-parameters (frame)
- (let ((params (assq (if (fboundp 'window-system)
- (window-system frame)
- window-system)
- mdw-frame-parameters-alist)))
- (when params
- (modify-frame-parameters frame (cdr params)))))
-(add-hook 'after-make-frame-functions 'mdw-set-frame-parameters)
-
;;;--------------------------------------------------------------------------
;;; General fontification.
(mdw-define-face comint-highlight-prompt
(t :weight bold))
-(mdw-define-face comint-highlight-input)
+(mdw-define-face comint-highlight-input
+ (t nil))
(mdw-define-face trailing-whitespace
(((class color)) :background "red")
(t :foreground "green"))
(mdw-define-face diff-removed
(t :foreground "red"))
-(mdw-define-face diff-context)
+(mdw-define-face diff-context
+ (t nil))
(mdw-define-face erc-input-face
(t :foreground "red"))
(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" "\""
(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)
(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))
(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
~mdw / profile / commitdiff