From 852cd5fbddafbfed93df4cda8ba366b14922e95d Mon Sep 17 00:00:00 2001 Message-Id: <852cd5fbddafbfed93df4cda8ba366b14922e95d.1718386744.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 28 Jan 2007 20:03:03 +0000 Subject: [PATCH] cleanup: Fix up whitespace everywhere. Organization: Straylight/Edgeware From: Mark Wooding --- Xdefaults | 14 +++++++------- bash_profile | 10 +++++----- bashrc | 22 +++++++++++----------- dircolors | 8 ++++---- dot-emacs.el | 36 ++++++++++++++++++------------------ e-keybindings.cfg | 10 +++++----- emacs | 2 +- eterm-theme.cfg | 28 ++++++++++++++-------------- evnc-keybindings.cfg | 10 +++++----- setup | 20 ++++++++++---------- 10 files changed, 80 insertions(+), 80 deletions(-) diff --git a/Xdefaults b/Xdefaults index 41a209e..4e2460c 100644 --- a/Xdefaults +++ b/Xdefaults @@ -27,9 +27,9 @@ ! --- Wily things --- -wily*p9font: FIXED -wily*font: FIXED -wily*fixed: FIXED +wily*p9font: FIXED +wily*font: FIXED +wily*fixed: FIXED ! --- Edwin --- @@ -50,8 +50,8 @@ XTerm*metaSendsEscape: true XTerm*eightBitInput: true XTerm*VT100*translations: #override \ - : scroll-back(1,halfpage) \n\ - : scroll-forw(1,halfpage) + : scroll-back(1,halfpage) \n\ + : scroll-forw(1,halfpage) ! --- XConsole settings --- @@ -82,8 +82,8 @@ Emacs.verticalScrollBars: right xvncviewer*shareDesktop: true xvncviewer*desktop.translations: #override\n\ - F8: SendRFBEvent()\n\ - !CtrlEscape: ShowPopup() + F8: SendRFBEvent()\n\ + !CtrlEscape: ShowPopup() ! --- Ytalk settings --- diff --git a/bash_profile b/bash_profile index e0bd570..8c7dca6 100644 --- a/bash_profile +++ b/bash_profile @@ -29,9 +29,9 @@ __mdw_addto () { [ -d $i ] || continue case "X$val" in X) - val=$i - continue - ;; + val=$i + continue + ;; X$i) continue ;; @@ -59,7 +59,7 @@ __mdw_addto () { __mdw_conf () { local var=$1 val=`sed -n " - /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ { + /^[ ]*$var[ ]*=[ ]*\(\|.*[^ ]\)[ ]*$/ { s//\1/; p; q } " ${MDWCONF-$HOME/.mdw.conf}` @@ -164,7 +164,7 @@ eval `start-ssh-agent -b` if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] || ( tty="`tty`" devtty="(/dev/)?${tty#/dev/}" { { { [ -e /etc/securetty ] && sectty=/etc/securetty; } || - { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } && + { [ -e /etc/securettys ] && sectty=/etc/securettys; }; } && egrep "$devtty" $sectty >/dev/null; } || { [ -e /etc/default/login ] && egrep "^CONSOLE=$devtty" /etc/default/login >/dev/null; } || diff --git a/bashrc b/bashrc index 60fed8a..4e941d1 100644 --- a/bashrc +++ b/bashrc @@ -21,7 +21,7 @@ if [ -t 0 ]; then PS2="> " PS4="+ " else - + case "$TERM" in linux*|screen*|xterm*|vt100*) bold='\[\]' unbold='\[\]' nl='\[ \]' ;; @@ -33,7 +33,7 @@ if [ -t 0 ]; then left="«" right="»" else case $USER in - mdw|mwooding) + mdw|mwooding) u="" left="[" right="]" ;; *) @@ -43,7 +43,7 @@ if [ -t 0 ]; then if [ "$__mdw_tty" = "`tty`" ]; then left="<" right=">" else - export __mdw_tty="`tty`" + export __mdw_tty="`tty`" fi fi @@ -86,7 +86,7 @@ shopt -u shift_verbose shopt -s sourcepath # --- Set the CDPATH --- -# +# # CDPATH=~/src:/usr/src:/usr/lib:/usr/share # dots=.. # i=6 @@ -237,13 +237,13 @@ pathhack () { continue ;; --) - shift + shift break ;; [-+]*) - ;; + ;; *) - break + break ;; esac hack=${arg#[+-]} @@ -254,16 +254,16 @@ pathhack () { } case "$arg,$force,:$PATH:" in -*,*,*:"$dir":*) - path-remove path "$dir" + path-remove path "$dir" ;; +*,t,*:"$dir":*) - path-remove path "$dir" + path-remove path "$dir" path-add path "$dir" ;; +*,nil,*:"$dir":*) - ;; + ;; +*,*) - path-add path "$dir" + path-add path "$dir" ;; esac shift diff --git a/dircolors b/dircolors index dc8d925..64e68fa 100644 --- a/dircolors +++ b/dircolors @@ -32,13 +32,13 @@ TERM screen-w # Background color codes: # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white NORMAL 00 # global default, although everything should be something. -FILE 00 # normal file -DIR 01;36 # directory -LINK 36 # symbolic link +FILE 00 # normal file +DIR 01;36 # directory +LINK 36 # symbolic link FIFO 32 # pipe SOCK 01;32 # socket BLK 01;35 # block device driver -CHR 35 # character device driver +CHR 35 # character device driver ORPHAN 40;31;01 # symlink to nonexistent file # This is for files with execute permission: diff --git a/dot-emacs.el b/dot-emacs.el index 7b7d4d5..b66a1e0 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -13,12 +13,12 @@ ;;; it under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 2 of the License, or ;;; (at your option) any later version. -;;; +;;; ;;; This program is distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. -;;; +;;; ;;; You should have received a copy of the GNU General Public License ;;; along with this program; if not, write to the Free Software Foundation, ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -226,9 +226,9 @@ (defun np (&optional arg) (interactive) (save-excursion (or arg (progn - (goto-char (point-max)) + (goto-char (point-max)) (insert "\nNP: ") - (insert-file np-file))))) + (insert-file np-file))))) (trap (require 'tramp) @@ -1350,10 +1350,10 @@ (defun mdw-fontify-sml () (list (concat "\\<\\(\\~\\|\\)" "\\(0\\(\\([wW]\\|\\)[xX][0-9a-fA-F]+\\|" - "[wW][0-9]+\\)\\|" - "\\([0-9]+\\(\\.[0-9]+\\|\\)" - "\\([eE]\\(\\~\\|\\)" - "[0-9]+\\|\\)\\)\\)") + "[wW][0-9]+\\)\\|" + "\\([0-9]+\\(\\.[0-9]+\\|\\)" + "\\([eE]\\(\\~\\|\\)" + "[0-9]+\\|\\)\\)\\)") '(0 mdw-number-face)) ;; --- And anything else is punctuation --- @@ -1485,31 +1485,31 @@ (defun mdw-fontify-tex () ;; --- Handle @/.../ for italics --- ;; (list "\\(@/\\)\\([^/]*\\)\\(/\\)" - ;; '(1 font-lock-keyword-face) - ;; '(3 font-lock-keyword-face)) + ;; '(1 font-lock-keyword-face) + ;; '(3 font-lock-keyword-face)) ;; --- Handle @*...* for boldness --- ;; (list "\\(@\\*\\)\\([^*]*\\)\\(\\*\\)" - ;; '(1 font-lock-keyword-face) - ;; '(3 font-lock-keyword-face)) + ;; '(1 font-lock-keyword-face) + ;; '(3 font-lock-keyword-face)) ;; --- Handle @`...' for literal syntax things --- ;; (list "\\(@`\\)\\([^']*\\)\\('\\)" - ;; '(1 font-lock-keyword-face) - ;; '(3 font-lock-keyword-face)) + ;; '(1 font-lock-keyword-face) + ;; '(3 font-lock-keyword-face)) ;; --- Handle @<...> for nonterminals --- ;; (list "\\(@<\\)\\([^>]*\\)\\(>\\)" - ;; '(1 font-lock-keyword-face) - ;; '(3 font-lock-keyword-face)) + ;; '(1 font-lock-keyword-face) + ;; '(3 font-lock-keyword-face)) ;; --- Handle other @-commands --- ;; (list "@\\([^a-zA-Z]\\|[a-zA-Z]*\\)" - ;; '(0 font-lock-keyword-face)) + ;; '(0 font-lock-keyword-face)) ;; --- Make sure we get comments properly --- @@ -1632,7 +1632,7 @@ (defun cpp-messages-mode () '(2 font-lock-string-face)) (list (concat "^\\([ \t]*#[ \t]*\\(\\(" preprocessor-keywords - "\\)\\>\\|[0-9]+\\|$\\)\\)") + "\\)\\>\\|[0-9]+\\|$\\)\\)") '(1 font-lock-keyword-face))) message-mode-keywords))) (turn-on-font-lock-if-enabled) diff --git a/e-keybindings.cfg b/e-keybindings.cfg index a6e5f07..c519a38 100644 --- a/e-keybindings.cfg +++ b/e-keybindings.cfg @@ -5,7 +5,7 @@ __E_CFG_VERSION 0 /* * Global button bindings... specially named actionclass that applies to * all client windows - so you can bind "alt - left click" to move the - * window, raise it or something.... + * window, raise it or something.... */ __ACLASS __BGN @@ -111,7 +111,7 @@ __END ****************************************************************************** * * Some Keys you can use to bind to (mainly standard English PC keyboard here) -* This is a SMALL list to make this file readable. it in no way lists ALL +* This is a SMALL list to make this file readable. it in no way lists ALL * possible keys that can be bound. This is just the useful keys from a normal * PC-style 101 key keyboard. * @@ -186,17 +186,17 @@ __ACLASS __BGN */ __NAME KEYBINDINGS __TYPE __TYPE_GLOBAL -/* +/* * The following key should be pretty self explanitory, but you should * really see how the Keysym is set. in your keysym.h file in your X11 * distribution */ __KEY Home -/* +/* * Can I use this with any modifier? (default is no) */ __MODIFIER_KEY __CTRL_ALT -/* +/* * you can also use modifier to specify a specific mod mask (alt,ctrl,qshift,etc) */ __EVENT __KEY_PRESS diff --git a/emacs b/emacs index 68b73fa..88c181a 100644 --- a/emacs +++ b/emacs @@ -169,7 +169,7 @@ ("ftp" . ,proxy) ("gopher" . ,proxy)))) (setq url-cookie-untrusted-urls '(".")) - + (setq browse-url-browser-function (mdw-good-url-browser) browse-url-mozilla-program "firefox") diff --git a/eterm-theme.cfg b/eterm-theme.cfg index 4852f50..1ad7c64 100644 --- a/eterm-theme.cfg +++ b/eterm-theme.cfg @@ -1,8 +1,8 @@ # ^- This must be the first line of any Eterm config file! # Format is: where VERSION is replaced by -# the version it was written for, -# minus the "DR-" if any. +# the version it was written for, +# minus the "DR-" if any. # # This is a sample Eterm config file. It should be placed in # ~/.Eterm/themes/Eterm/MAIN and modified to suit your needs @@ -36,16 +36,16 @@ begin color # The colors below are taken from Rasterman's .Xdefaults file. They are intended to # display ANSI art properly when combined with a good ANSI-art font (like vga or # Rasterman's nexus font). - color 0 #000000 - color 1 #aa0000 - color 2 #008800 - color 3 #aa5522 - color 4 #0000cc - color 5 #aa00aa - color 6 #00aaaa - color 7 #dddddd - color 8 #444444 - color 9 #ff4444 + color 0 #000000 + color 1 #aa0000 + color 2 #008800 + color 3 #aa5522 + color 4 #0000cc + color 5 #aa00aa + color 6 #00aaaa + color 7 #dddddd + color 8 #444444 + color 9 #ff4444 color 10 #44ff44 color 11 #ffff44 color 12 #4466ff @@ -91,7 +91,7 @@ begin image state normal color #000000 #d0d0d0 end image - + # menu_text black # scrollbar #d0d0d0 @@ -102,7 +102,7 @@ end image begin attributes # Geometry == widthxheight+x_offset+y_offset, offsets from top left -# if +, bottom right if - +# if +, bottom right if - # geometry 132x50+100+100 title Eterm name %appname() diff --git a/evnc-keybindings.cfg b/evnc-keybindings.cfg index da3bfa8..4b07f09 100644 --- a/evnc-keybindings.cfg +++ b/evnc-keybindings.cfg @@ -5,7 +5,7 @@ __E_CFG_VERSION 0 /* * Global button bindings... specially named actionclass that applies to * all client windows - so you can bind "alt - left click" to move the - * window, raise it or something.... + * window, raise it or something.... */ __ACLASS __BGN @@ -111,7 +111,7 @@ __END ****************************************************************************** * * Some Keys you can use to bind to (mainly standard English PC keyboard here) -* This is a SMALL list to make this file readable. it in no way lists ALL +* This is a SMALL list to make this file readable. it in no way lists ALL * possible keys that can be bound. This is just the useful keys from a normal * PC-style 101 key keyboard. * @@ -186,17 +186,17 @@ __ACLASS __BGN */ __NAME KEYBINDINGS __TYPE __TYPE_GLOBAL -/* +/* * The following key should be pretty self explanitory, but you should * really see how the Keysym is set. in your keysym.h file in your X11 * distribution */ __KEY Home -/* +/* * Can I use this with any modifier? (default is no) */ __MODIFIER_KEY __CTRL_ALT -/* +/* * you can also use modifier to specify a specific mod mask (alt,ctrl,qshift,etc) */ __EVENT __KEY_PRESS diff --git a/setup b/setup index 194e1bc..ec629c4 100755 --- a/setup +++ b/setup @@ -48,7 +48,7 @@ for i in bin lib/emacs src; do echo " done." fi done -echo " all done." +echo " all done." ### Find out how to fetch things over the net $echon "Finding URL fetcher:$echoc" @@ -90,7 +90,7 @@ for script in $scripts; do fi done -echo " all done." +echo " all done." ### Install some more complicated programs echo "Installing packages..." @@ -129,7 +129,7 @@ for system in $systems; do ) fi done -echo " all done." +echo " all done." ### Install global configuration echo -n "Installing dotfile configuration:" @@ -141,9 +141,9 @@ else fi ### Symlink the various dotfiles into place -dotfiles=" +dotfiles=" bash_profile bash_logout bashrc inputrc bash_completion - emacs emacs-calc + emacs emacs-calc vm mailrc signature gitconfig cgrc stgitrc tigrc lisp-init.lisp:.cmucl-init.lisp @@ -171,7 +171,7 @@ for d in $dotfiles; do mv $ft.new $ft echo " $target" done -echo " all done." +echo " all done." ### Set up the Emacs config $echon "Finding a suitable emacs:$echoc" @@ -198,9 +198,9 @@ for elib in $emacspkg; do $echon " $elib:$echoc" if $false $emacs >/dev/null 2>&1 --no-site-file --batch --eval ' (progn - (setq load-path (nconc load-path (list "~/lib/emacs"))) - (kill-emacs (condition-case nil - (progn (load-library "'"$elib"'") 0) + (setq load-path (nconc load-path (list "~/lib/emacs"))) + (kill-emacs (condition-case nil + (progn (load-library "'"$elib"'") 0) (error 1))))'; then echo " already installed." else @@ -213,7 +213,7 @@ for elib in $emacspkg; do echo " done." fi done -echo " all done." +echo " all done." $echon "Setting up Emacs configuration:$echoc" $echon " linking$echoc" -- [mdw]