Loads of misc updates

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/00-build.el b/00-build.el
index 350feeb..b337116 100644 (file)
--- a/00-build.el
+++ b/00-build.el
@@ -1,11 +1,11 @@
 ;; 00-build.el --- Loads the required crap for all my init files   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Saturday Jun 23, 2012 13:11:29 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:31:53 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/00-build.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/01-vars-sy.el b/01-vars-sy.el
index 76f43df..7318ec3 100644 (file)
--- a/01-vars-sy.el
+++ b/01-vars-sy.el
@@ -1,11 +1,11 @@
 ;; 00-vars-sy.el --- Various variables   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:53:05 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:34:34 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/00-vars-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/02-keys-sy.el b/02-keys-sy.el
index 3029359..50a2572 100644 (file)
--- a/02-keys-sy.el
+++ b/02-keys-sy.el
@@ -1,11 +1,11 @@
 ;; 02-keys-sy.el --- Keybindings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:53:27 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:38:11 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/02-keys-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/03-c-mode-sy.el b/03-c-mode-sy.el
index 66adb9f..0b5f273 100644 (file)
--- a/03-c-mode-sy.el
+++ b/03-c-mode-sy.el
@@ -1,11 +1,11 @@
 ;; 03-c-mode-sy.el --- Set up C mode   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:53:58 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:39:52 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/03-c-mode-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/04-w3-sy.el b/04-w3-sy.el
index 0d96443..ec8f7c6 100644 (file)
--- a/04-w3-sy.el
+++ b/04-w3-sy.el
@@ -1,11 +1,11 @@
 ;; 04-w3-sy.el --- W3 Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:54:56 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:40:38 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/04-w3-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/05-latex-sy.el b/05-latex-sy.el
index 72e873c..9d86811 100644 (file)
--- a/05-latex-sy.el
+++ b/05-latex-sy.el
@@ -1,11 +1,11 @@
 ;; 05-latex-sy.el --- LaTeX Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Saturday Jun 23, 2012 13:00:04 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:44:34 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/05-latex-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -69,7 +69,7 @@
 (require 'reftex)
 (require 'reftex-vars)
 ;(require 'latex-units)
-(require 'font-latex)
+;(require 'font-latex)
 
 ;:*=======================
 ;:* Shutup the byte-compiler
@@ -141,20 +141,9 @@ Replacement for count-lines-region."
 ;: RefTeX is a minor mode with distinct support for \ref, \label and
 ;: \cite commands in (multi-file) LaTeX documents.
 (setq 
- reftex-default-label-alist-entries '(Sideways 
-                                     AMSTeX 
-                                     amsmath
-                                     endnotes
-                                     fancybox
-                                     floatfig
-                                     longtable
-                                     picinpar
-                                     rotating
-                                     sidecap
-                                     subfigure
-                                     supertab
-                                     wrapfig
-                                     LaTeX)
+ reftex-default-label-alist-entries
+ '(Sideways AMSTeX amsmath endnotes fancybox floatfig longtable
+           picinpar rotating sidecap subfigure supertab wrapfig LaTeX)
  reftex-enable-partial-scans t
  reftex-extra-bindings t
  reftex-guess-label-type t

diff --git a/06-tex-site-sy.el b/06-tex-site-sy.el
index f93feb7..e76ab26 100644 (file)
--- a/06-tex-site-sy.el
+++ b/06-tex-site-sy.el
@@ -1,11 +1,11 @@
 ;; 06-tex-site-sy.el --- Because AUCTeX is stupid   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:55:38 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:45:38 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/06-tex-site-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/07-html-sy.el b/07-html-sy.el
index 38e05bf..9dabd6f 100644 (file)
--- a/07-html-sy.el
+++ b/07-html-sy.el
@@ -1,11 +1,11 @@
 ;; 07-html-sy.el --- HTML settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:56:40 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:49:48 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/07-html-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -97,23 +97,6 @@
                "/usr/share/sxemacs/xemacs-packages/etc/psgml-dtds/")
              sy-sgml-dirs))
 
-;; Run HTML Tidy over the current buffer.  I don't use this yet, I've
-;; only just installed HTML Tidy and haven't yet figured out how to
-;; use it properly.  I snarfed this function from:
-;;
-;;      <http://www.hollenback.net/index.php/EmacsTidy>
-(defun tidy-buffer ()
-  "Run Tidy HTML parser on current buffer."
-  (interactive)
-  (if (get-buffer "tidy-errs") 
-      (kill-buffer "tidy-errs"))
-  (shell-command-on-region (point-min) (point-max)
-                          "tidy -f /tmp/tidy-errs -q -i -wrap 72 -c" t)
-  (find-file-other-window "/tmp/tidy-errs")
-  (other-window 1)
-  (delete-file "/tmp/tidy-errs")
-  (message "buffer tidy'ed"))
-
 (autoload 'html-mode "psgml-html" "Load psgml-html-mode" t)
 (autoload 'css-mode "css-mode")
 

diff --git a/08-bbdb-sy.el b/08-bbdb-sy.el
index 66d4786..6051eea 100644 (file)
--- a/08-bbdb-sy.el
+++ b/08-bbdb-sy.el
@@ -1,11 +1,11 @@
 ;; 08-bbdb-sy.el --- Big Brother DataBase (BBDB)   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:57:19 steve>
+;; Time-stamp: <Friday Aug 16, 2013 13:04:37 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/08-bbdb-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -91,31 +91,34 @@ Kudos to Robert Fenk <fenk@users.sf.net> for this."
 
 (autoload 'gnus-convert-face-to-png "gnus-fun")
 
+;;; FIXME: Not ideal, it currently puts cface at one end of the name,
+;;; and the xface at the other.  I'd prefer both glyphs on the same
+;;; side (preferrably left)
 (defun sy-bbdb-display-cx-face ()
   "Search for face properties and display the faces.
 This is from Alex Shroeder."
   (let ((inhibit-read-only t); edit the BBDB buffer
        (all-records bbdb-records)
-       cface xface record start)
+       cface xface record start ext)
     (while all-records
       (setq record (caar all-records)
            cface (bbdb-record-getprop record 'cface)
            xface (bbdb-record-getprop record 'face)
            start (marker-position (nth 2 (car all-records))))
+      (when (or cface xface)
+       (setq ext (extent-at start)))
       (when cface
-       (set-extent-begin-glyph 
-        (make-extent start start)
+       (set-extent-begin-glyph
+        ext
         (make-glyph
-         (list (vector 'png :data (gnus-convert-face-to-png cface)))))
-       (insert " "))
+         (list (vector 'png :data (gnus-convert-face-to-png cface))))))
       (when xface
-       (set-extent-begin-glyph 
-        (make-extent start start)
+       (set-extent-end-glyph
+        ext
         (make-glyph
          (list (vector 'xface :data (concat "X-Face: " xface)
                        :foreground "black"
-                       :background "white"))))
-       (insert " "))
+                       :background "white")))))
       (setq all-records (cddr all-records)))))
 
 (setq 
@@ -159,7 +162,11 @@ This is from Alex Shroeder."
                "steve@sxemacs.org"
                "steve@emchat.org"
                "sryoungs@iinet.net.au"
-               "jackalx@gmail.com")))
+               "steve.r.youngs@gmail.com"
+               ;; The following aren't mine, but I'm using
+               ;; `bbdb-user-mail-names' in
+               ;; `gnus-ignored-from-addresses.  It's just easier.
+               "post@gwene.org")))
   (setq bbdb-user-mail-names (regexp-opt emails t)))
 
 ;:*=======================

diff --git a/09-sounds-sy.el b/09-sounds-sy.el
index fd0d470..5eb3167 100644 (file)
--- a/09-sounds-sy.el
+++ b/09-sounds-sy.el
@@ -1,11 +1,11 @@
 ;; 09-sounds-sy.el --- Sound set up   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Saturday Jan 26, 2013 21:45:54 steve>
+;; Time-stamp: <Friday Aug 16, 2013 13:05:54 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/09-sounds-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/10-toolbar-sy.el b/10-toolbar-sy.el
index e1d8b10..1281070 100644 (file)
--- a/10-toolbar-sy.el
+++ b/10-toolbar-sy.el
@@ -1,11 +1,11 @@
 ;; 10-toolbar-sy.el --- Toolbar set up   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:57:59 steve>
+;; Time-stamp: <Friday Aug 16, 2013 13:08:36 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/10-toolbar-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/11-pkgs-sy.el b/11-pkgs-sy.el
index b009153..b4520f7 100644 (file)
--- a/11-pkgs-sy.el
+++ b/11-pkgs-sy.el
@@ -1,11 +1,11 @@
 ;; 11-pkgs-sy.el --- Various XE Package Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Friday Jun 29, 2012 19:25:52 steve>
+;; Time-stamp: <Friday Aug 16, 2013 13:27:27 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/11-pkgs-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -92,9 +92,9 @@
 (global-set-key [XF86AudioMute] #'mpd-volume-mute/unmute)
 
 ;; Mpd frame props
-;(push (cons 'override-redirect t) mpd-dock-frame-plist)
-(push (cons 'left 1568) mpd-dock-frame-plist)
-(push (cons 'top 360) mpd-dock-frame-plist)
+(push (cons 'override-redirect t) mpd-dock-frame-plist)
+(push (cons 'left 1780) mpd-dock-frame-plist)
+(push (cons 'top 5) mpd-dock-frame-plist)
 (push (cons 'internal-border-width 4) mpd-dock-frame-plist)
 (push (cons 'border-width 1) mpd-dock-frame-plist)
 (push (cons 'border-color "red") mpd-dock-frame-plist)
@@ -230,8 +230,9 @@
 ;:  Comment or uncomment each line in the region.
 ;:  Comments are terminated on each line, even for syntax in which newline does
 ;:  not end the comment.  Blank lines do not get comments.
-(global-set-key '(control f12)  'comment-region)
-(global-set-key '(meta f12) 'uncomment-region)
+(require 'newcomment)
+(global-set-key '(control f12)  'comment-or-uncomment-region)
+(global-set-key '(meta f12) 'uncomment-or-uncomment-region)
 
 ;:*======================
 ;:* parens that mark sexpressions

diff --git a/12-cal-sy.el b/12-cal-sy.el
index fdfaa81..7006b89 100644 (file)
--- a/12-cal-sy.el
+++ b/12-cal-sy.el
@@ -1,11 +1,11 @@
 ;; 12-cal-sy.el --- Calendar Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jul  1, 2012 00:45:19 steve>
+;; Time-stamp: <Friday Aug 16, 2013 09:27:03 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/12-cal-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -67,7 +67,7 @@
  calendar-time-zone 600
  calendar-standard-time-zone-name "EST"
  cal-tex-diary t
-; calendar-date-display-form 
+; calendar-date-display-form ; see: "Howm Integration" below
 ; '((if dayname (concat dayname ", ")) day " " monthname " " year)
  calendar-time-display-form
  '(24-hours ":" minutes
@@ -262,7 +262,7 @@ characters on the line."
  display-time-mail-balloon-max-displayed 20
  display-time-mail-balloon-gnus-split-width 19
  display-time-mail-balloon-enhance-gnus-group
- '("\\(private.*\\|xemacs\\.private\\)")
+ '("private.*")
  display-time-mail-balloon-suppress-gnus-group
  '("\\(SPAM.*\\|returned\\.mail\\)"))
 (display-time)
@@ -363,53 +363,52 @@ Ever-so-slightly modified to include the Easter Monday holiday."
  other-holidays nil)
 
 ;; Set up standard Aussie holidays
-(setq
- calendar-holidays '((holiday-fixed 1 1 "New Year's Day")
-                    ;; If New Year's day is on a weekend the public
-                    ;; holiday is the following Monday
-                    (if (or (eq 0 (calendar-day-of-week (list 1 1 displayed-year)))
-                            (eq 6 (calendar-day-of-week (list 1 1 displayed-year))))
-                        (holiday-float 1 1 1 "New Year's Day Public Holiday"))
-                    (holiday-fixed 1 26 "Australia Day")
-                    ;; If Australia Day falls on a weekend, the
-                    ;; holiday is the following Monday
-                    (if (eq 0 (calendar-day-of-week (list 1 26 displayed-year)))
-                        (holiday-fixed 1 27 "Australia Day Public Holiday"))
-                    (if (eq 6 (calendar-day-of-week (list 1 26 displayed-year)))
-                        (holiday-fixed 1 28 "Australia Day Public Holiday"))
-                    (holiday-fixed 2 14 "Valentine's Day")
-                    (holiday-fixed 3 17 "St. Patrick's Day")
-                    (holiday-fixed 4 1 "April Fools' Day")
-                    (holiday-fixed 4 25 "Anzac Day")
-                    ;; If Anzac Day falls on a weekend, the holiday
-                    ;; is the following Monday
-                    (if (eq 0 (calendar-day-of-week (list 4 25 displayed-year)))
-                        (holiday-fixed 4 26 "Anzac Day Public Holiday"))
-                    (if (eq 6 (calendar-day-of-week (list 4 25 displayed-year)))
-                        (holiday-fixed 4 27 "Anzac Day Public Holiday"))
-                    (holiday-float 5 1 1 "Labour Day")
-                    (holiday-float 5 0 2 "Mother's Day")
-                    (holiday-float 6 1 2 "Queen's Birthday")
-                    ;; Brisbane Ekka holiday is on the 2nd Wednesday
-                    ;; in August, unless there are 5 Wednesdays in
-                    ;; August, then it is the 3rd Wednesday.
-                    (if (eq 8 (car (calendar-nth-named-day 5 3 8 displayed-year 0)))
-                        (holiday-float 8 3 3 "Brisbane Show Day")
-                      (holiday-float 8 3 2 "Brisbane Show Day"))
-                    (holiday-float 8 3 3 "Brisbane Show Day") ; This might be wrong?
-                    (holiday-float 9 0 1 "Father's Day")
-                    (holiday-fixed 12 25 "Christmas Day")
-                    (holiday-fixed 12 26 "Boxing Day")
-                    ;; If Xmas falls on weekend, the public holiday
-                    ;; is the following Mon/Tue
-                    (if (or (eq 0 (calendar-day-of-week (list 12 25 displayed-year)))
-                            (eq 6 (calendar-day-of-week (list 12 25 displayed-year))))
-                        (holiday-fixed 12 27 "Xmas Day Public Holiday"))
-                    (if (or (eq 0 (calendar-day-of-week (list 12 26 displayed-year)))
-                            (eq 6 (calendar-day-of-week (list 12 26 displayed-year))))
-                        (holiday-fixed 12 28 "Boxing Day Public Holiday"))
-                    (solar-equinoxes-solstices)
-                    (sy-easter-holidays)))
+(setq calendar-holidays
+      '((holiday-fixed 1 1 "New Year's Day")
+       ;; If New Year's day is on a weekend the public
+       ;; holiday is the following Monday
+       (if (or (eq 0 (calendar-day-of-week (list 1 1 displayed-year)))
+               (eq 6 (calendar-day-of-week (list 1 1 displayed-year))))
+           (holiday-float 1 1 1 "New Year's Day Public Holiday"))
+       (holiday-fixed 1 26 "Australia Day")
+       ;; If Australia Day falls on a weekend, the
+       ;; holiday is the following Monday
+       (if (eq 0 (calendar-day-of-week (list 1 26 displayed-year)))
+           (holiday-fixed 1 27 "Australia Day Public Holiday"))
+       (if (eq 6 (calendar-day-of-week (list 1 26 displayed-year)))
+           (holiday-fixed 1 28 "Australia Day Public Holiday"))
+       (holiday-fixed 2 14 "Valentine's Day")
+       (holiday-fixed 3 17 "St. Patrick's Day")
+       (holiday-fixed 4 1 "April Fools' Day")
+       (holiday-fixed 4 25 "Anzac Day")
+       ;; If Anzac Day falls on a weekend, the holiday
+       ;; is the following Monday
+       (if (eq 0 (calendar-day-of-week (list 4 25 displayed-year)))
+           (holiday-fixed 4 26 "Anzac Day Public Holiday"))
+       (if (eq 6 (calendar-day-of-week (list 4 25 displayed-year)))
+           (holiday-fixed 4 27 "Anzac Day Public Holiday"))
+       (holiday-float 5 1 1 "Labour Day")
+       (holiday-float 5 0 2 "Mother's Day")
+       (holiday-float 6 1 2 "Queen's Birthday")
+       ;; Brisbane Ekka holiday is on the 2nd Wednesday
+       ;; in August, unless there are 5 Wednesdays in
+       ;; August, then it is the 3rd Wednesday.
+       (if (eq 8 (car (calendar-nth-named-day 5 3 8 displayed-year)))
+           (holiday-float 8 3 3 "Brisbane Show Day")
+         (holiday-float 8 3 2 "Brisbane Show Day"))
+       (holiday-float 9 0 1 "Father's Day")
+       (holiday-fixed 12 25 "Christmas Day")
+       (holiday-fixed 12 26 "Boxing Day")
+       ;; If Xmas falls on weekend, the public holiday
+       ;; is the following Mon/Tue
+       (if (or (eq 0 (calendar-day-of-week (list 12 25 displayed-year)))
+               (eq 6 (calendar-day-of-week (list 12 25 displayed-year))))
+           (holiday-fixed 12 27 "Xmas Day Public Holiday"))
+       (if (or (eq 0 (calendar-day-of-week (list 12 26 displayed-year)))
+               (eq 6 (calendar-day-of-week (list 12 26 displayed-year))))
+           (holiday-fixed 12 28 "Boxing Day Public Holiday"))
+       (solar-equinoxes-solstices)
+       (sy-easter-holidays)))
 (setq mark-holidays-in-calendar t)
 
 ;:*=======================

diff --git a/13-misc-sy.el b/13-misc-sy.el
index 8b07b6b..17031c6 100644 (file)
--- a/13-misc-sy.el
+++ b/13-misc-sy.el
@@ -1,11 +1,11 @@
 ;; 13-misc-sy.el --- Miscellaneous Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Jan 31, 2013 12:41:52 steve>
+;; Time-stamp: <Friday Aug 16, 2013 13:50:14 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/13-misc-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -122,9 +122,7 @@ instead."
 (setq frame-title-format
       (concat "-={%b}=- "
              (construct-emacs-version-name)
-             (if (featurep 'mule)
-                 " (Mule) ["
-               " (non-Mule) [")
+             " ["
              (and-boundp 'sxemacs-codename
                sxemacs-codename)
              "]"))
@@ -379,11 +377,11 @@ instead."
        ("^/instpkg" . ,(concat (car emacs-roots)
                                "share/sxemacs"))
        ("^/prog" . "~/programming")
-       ("^/linux" . "/usr/src/linux")
+       ("^/linux" . "/usr/src/kernel/linux")
        ("^/src" . "/usr/src")
-       ("^/sexy" . "~/programming/SXEmacs")
-       ("^/sexycore" . "~/programming/SXEmacs/core")
-       ("^/sexyweb" . "~/programming/SXEmacs/web")))
+       ("^/sxe" . "/home/steve/programming/SXEmacs")
+       ("^/core" . "/home/steve/programming/SXEmacs/core/sxemacs.git")
+       ("^/web" . "/home/steve/programming/SXEmacs/web/website")))
 
 ;:*======================
 ;:* The beginnings of procmail-mode.el.

diff --git a/14-fonts-sy.el b/14-fonts-sy.el
index 74dd17a..39d2561 100644 (file)
--- a/14-fonts-sy.el
+++ b/14-fonts-sy.el
@@ -1,11 +1,11 @@
 ;; 14-fonts-sy.el --- Fonts/Faces Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 10:59:45 steve>
+;; Time-stamp: <Friday Aug 16, 2013 14:03:07 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/14-fonts-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -217,8 +217,6 @@
      (emchat-face-online ((t (:foreground "green"))))
      (emchat-face-selected ((t (:background "yellow" :foreground "darkblue"))))
      (emchat-wharf-default-face ((t (:foreground "Green" :size "10pt"))))
-     ;; MPD
-     (mpd-dock-face ((t (:foreground "Red" :size "10pt"))))
      ;; LaTeX
      (font-latex-bold-face ((t (:foreground "brown"))))
      (font-latex-italic-face ((t (:foreground "lightcoral"))))
@@ -417,8 +415,8 @@
 
 ;:*======================= :* 
 ; Use a sexy background pixmap.
-;(set-face-background-pixmap 'default 
-;                          [xpm :file "~/documents/pictures/marble.xpm"]))
+; (set-face-background-pixmap 'default 
+;                          [xpm :file "~/documents/pictures/marble.xpm"])
 ;:*=======================
 ;:* Set background-mode to dark (why isn't this autodetected?)
 (setq frame-background-mode 'dark)

diff --git a/15-supercite-sy.el b/15-supercite-sy.el
index 0704121..2fcbe6e 100644 (file)
--- a/15-supercite-sy.el
+++ b/15-supercite-sy.el
@@ -1,11 +1,11 @@
 ;; 15-supercite-sy.el --- Mail citing Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Jun 10, 2012 11:00:07 steve>
+;; Time-stamp: <Friday Aug 16, 2013 14:15:30 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/15-supercite-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -107,7 +107,7 @@
  sc-nested-citation-p t
  sc-citation-leader "  "
  sc-citation-separator " "
- sc-reference-tag-string "* "
+ sc-reference-tag-string ""
  sc-citation-delimiter "> "
  sc-extract-address-components 'gnus-extract-address-components)
 

diff --git a/16-riece-sy.el b/16-riece-sy.el
index e74d590..4517c6a 100644 (file)
--- a/16-riece-sy.el
+++ b/16-riece-sy.el
@@ -1,11 +1,11 @@
 ;; 16-riece-sy.el --- Riece (IRC) Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Tuesday Jan 29, 2013 17:55:04 steve>
+;; Time-stamp: <Friday Aug 16, 2013 14:16:53 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/16-riece-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit

diff --git a/17-emchat-sy.el b/17-emchat-sy.el
index 0071f74..353d442 100644 (file)
--- a/17-emchat-sy.el
+++ b/17-emchat-sy.el
@@ -1,11 +1,11 @@
 ;; 17-emchat-sy.el --- EMchat Settings   -*- Emacs-Lisp -*-
 
-;; Copyright (C) 2007 - 2012 Steve Youngs
+;; Copyright (C) 2007 - 2013 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Jan 30, 2013 17:20:27 steve>
+;; Time-stamp: <Friday Aug 16, 2013 14:17:23 steve>
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/17-emchat-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
@@ -297,12 +297,12 @@ time, beer, song, help."))
   (require 'emchat-wharf)
   (setq emchat-wharf-frame-use-p t)
   (setq emchat-wharf-notice-riece-flag t)
-  (push (cons 'left 1578) emchat-wharf-frame-props)
-  (push (cons 'top 289) emchat-wharf-frame-props)
+  (push (cons 'left 1690) emchat-wharf-frame-props)
+  (push (cons 'top 5) emchat-wharf-frame-props)
   (push (cons 'internal-border-width 4) emchat-wharf-frame-props)
   ;; `override-redirect' means no WM decorations, and you also get
-  ;; sticky and always on top
-  ;(push (cons 'override-redirect t) emchat-wharf-frame-props)
+  ;; sticky and always on top and skip pagers and task lists etc.
+  (push (cons 'override-redirect t) emchat-wharf-frame-props)
   (push (cons 'border-width 1) emchat-wharf-frame-props)
   (push (cons 'border-color "red") emchat-wharf-frame-props)
   (add-hook 'emchat-new-message-hook #'emchat-wharf-inc-messages)