diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 15:20:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 15:20:39 -0400 |
| commit | 3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (patch) | |
| tree | 584c6b0c0e8b1041e2c9483e218b035cb02d1eee | |
| parent | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (diff) | |
| parent | d794d461f2e91af847beed7783cde2c7e65fd725 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.login-daemons
| -rw-r--r-- | .emacs | 3 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 1 | ||||
| -rw-r--r-- | .git.info.exclude | 33 | ||||
| -rw-r--r-- | .gitconfig | 5 | ||||
| -rw-r--r-- | .login-daemons | 7 |
5 files changed, 30 insertions, 19 deletions
@@ -43,9 +43,10 @@ (setq my-el-get-packages '(el-get ; nxhtml + apel flim semi wanderlust smarttabs )) - + ;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ELPA diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index ee82309..5a3e67f 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -9,6 +9,7 @@ '(explicit-shell-file-name "/bin/bash") '(inhibit-startup-screen t) '(mdmua-maildir "~/Maildir") + '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) '(scroll-bar-mode nil)) diff --git a/.git.info.exclude b/.git.info.exclude index 4576b6f..a2d075e 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -28,36 +28,44 @@ # Ignore temp/log/history files *.log log* -*cache* + *.tmp *.tmp.* tmp.* tmp-* tmp -*.lock -*.state -*~ -.#* -\#*# -.~lock.*# + *_history *_hist history.* -*authority +history + +*.lock +.~lock.*# +lock + +*.state *.cookie *.bak +*authority +*cache* + +# Ignore files left by editors +*~ +.#* +\#*# + + # Ignore these special-purpose cache/temp files .camel_certs .compiz/session/* .config/chromium/Default/History\ Index* .current.asound .dbus/session-bus/* -.ddd/history .ddd/sessions .dvdcss .esd_auth -.eshell/history .evolution/.* .gconfd/saved_state .gnash-media @@ -68,7 +76,7 @@ history.* .kde4/share/apps/okular/docdata/* .kde4/socket-* .lesshst -.links2/links.his +.link*/*.his .local/share/Trash/* .local/share/gvfs-metadata/* .local/share/icons/* @@ -76,10 +84,13 @@ history.* .pki .pulse .pulse-cookie +.recently-used .recently-used.xbel* +.setroubleshoot .shotwell/thumbs/* .sudo_as_admin_successful .thumbnails/* +.wireshark/recent* .xsession-errors* # Ignore files that are autogenerated @@ -3,3 +3,8 @@ email = LukeShu@sbcglobal.net [color] ui = auto +[sendemail] + smtpencryption = ssl + smtpserver = plus.smtp.mail.yahoo.com + smtpuser = lukeshu@sbcglobal.net + smtpserverport = 465 diff --git a/.login-daemons b/.login-daemons index f088914..9a645d7 100644 --- a/.login-daemons +++ b/.login-daemons @@ -1,12 +1,5 @@ #!/bin/sh if [ -x "`which daemon`" ]; then - daemon emacs --daemon - daemon sysfiles - #daemon maildirproc daemon gpg-agent --daemon --write-env-file "${HOME}/.gnupg/agent-info" - daemon batterymon 20 " - alsactl restore --file $HOME/.full.asound; - espeak 'PLUG ME IN'; - sleep .2;" fi |