'nother big round of updates

* cleanup:
  Rename all inits, dropping the '-sy' suffix
  A big fat general update and tidy up of all my inits

diff --git a/00-build.el b/00-build.el
index b0cd3db..c310457 100644 (file)
--- a/00-build.el
+++ b/00-build.el
@@ -1,13 +1,13 @@
-;; 00-build.el --- Loads the required crap for all my init files   -*- Emacs-Lisp -*-
+;; 00-build.el --- Loads the required crap for all my init files
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Feb 13, 2020 22:54:52 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/00-build.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:33:39 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/00-build.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/01-vars-sy.el b/01-vars.el
similarity index 94%
rename from 01-vars-sy.el
rename to 01-vars.el
index 18d8127..e2ecb34 100644 (file)
--- a/01-vars-sy.el
+++ b/01-vars.el
@@ -1,13 +1,13 @@
-;; 01-vars-sy.el --- Various variables
+;; 01-vars.el --- Various variables
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Mar  8, 2020 11:17:00 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/01-vars-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:38:48 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/01-vars.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -66,7 +66,7 @@
 
 
 ;:*=======================
-;:* Set default font (I do this in vars-sy.el because it is called first)
+;:* Set default font
 (defvar sydeffaces
   '(default bold bold-italic italic)
   "List symbols for default fonts.")
@@ -150,12 +150,13 @@
   ;; Order is important here
   (progn
     (require 'tae)
-    (require 'un-define))
+    (require 'un-define)
+    (set-coding-priority-list '(utf-8))
+    (set-coding-category-system 'utf-8 'utf-8))
   (and (coding-system-p (find-coding-system 'utf-8))
        (setq-default buffer-file-coding-system
                     (coding-system-name
                      (find-coding-system 'utf-8)))))
-;)
 
 ;:*=======================
 ;:* Fix #'run-at-time

diff --git a/02-keys-sy.el b/02-keys.el
similarity index 96%
rename from 02-keys-sy.el
rename to 02-keys.el
index e29fa84..9d9edb7 100644 (file)
--- a/02-keys-sy.el
+++ b/02-keys.el
@@ -1,13 +1,13 @@
-;; 02-keys-sy.el --- Keybindings   -*- Emacs-Lisp -*-
+;; 02-keys.el --- Keybindings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Mar 19, 2020 09:43:00 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/02-keys-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:44:18 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/02-keys.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/03-c-mode-sy.el b/03-c-mode.el
similarity index 81%
rename from 03-c-mode-sy.el
rename to 03-c-mode.el
index 34a2d7e..2084c3c 100644 (file)
--- a/03-c-mode-sy.el
+++ b/03-c-mode.el
@@ -1,13 +1,13 @@
-;; 03-c-mode-sy.el --- Set up C mode   -*- Emacs-Lisp -*-
+;; 03-c-mode.el --- Set up C mode
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 12:00:39 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/03-c-mode-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:45:27 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/03-c-mode.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -77,10 +77,8 @@ Key-bindings:
   (c-set-style "linux")
   (setq mode-name "Linux/C"))
 
-(unless (member '("^.*/linux.*/.*\\.[ch]$" . linux-c-mode)
-               auto-mode-alist)
-  (add-to-list 'auto-mode-alist
-              '("^.*/linux.*/.*\\.[ch]$" . linux-c-mode)))
+(add-to-list
+ 'auto-mode-alist '("^.*/linux.*/.*\\.[ch]$" . linux-c-mode))
 
 ;:*=======================
 ;:* C style for XEmacs core source files
@@ -93,10 +91,8 @@ Key-bindings:
   (c-set-style "gnu")
   (setq mode-name "XE/C"))
 
-(unless (member '("^.*/xemacs.*/.*\\.[ch]$" . xemacs-c-mode)
-               auto-mode-alist)
-  (add-to-list 'auto-mode-alist
-              '("^.*/xemacs.*/.*\\.[ch]$" . xemacs-c-mode)))
+(add-to-list
+ 'auto-mode-alist '("^.*/xemacs.*/.*\\.[ch]$" . xemacs-c-mode))
 
 ;:*=======================
 ;:* C style for SXEmacs core source files
@@ -112,10 +108,8 @@ Key-bindings:
   (make-variable-buffer-local 'c-enable-xemacs-performance-kludge-p)
   (setq c-enable-xemacs-performance-kludge-p t))
 
-(unless (member '("^.*/sxemacs.*/.*\\.[ch]$" . sxemacs-c-mode)
-               auto-mode-alist)
-  (add-to-list 'auto-mode-alist
-              '("^.*/sxemacs.*/.*\\.[ch]$" . sxemacs-c-mode)))
+(add-to-list
+ 'auto-mode-alist '("^.*/sxemacs.*/.*\\.[ch]$" . sxemacs-c-mode))
 
 ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 (message "C mode initialised.")

diff --git a/04-w3-sy.el b/04-w3.el
similarity index 91%
rename from 04-w3-sy.el
rename to 04-w3.el
index efad85a..0339ab7 100644 (file)
--- a/04-w3-sy.el
+++ b/04-w3.el
@@ -1,13 +1,13 @@
-;; 04-w3-sy.el --- W3 Settings   -*- Emacs-Lisp -*-
+;; 04-w3.el --- W3 Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 12:01:38 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/04-w3-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:47:51 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/04-w3.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/05-latex-sy.el b/05-latex.el
similarity index 88%
rename from 05-latex-sy.el
rename to 05-latex.el
index 18fc584..2d20f3b 100644 (file)
--- a/05-latex-sy.el
+++ b/05-latex.el
@@ -1,13 +1,13 @@
-;; 05-latex-sy.el --- LaTeX Settings   -*- Emacs-Lisp -*-
+;; 05-latex.el --- LaTeX Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Monday Mar 16, 2020 12:51:47 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/05-latex-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 06:49:13 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/05-latex.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -62,19 +62,32 @@
 ;:*=======================
 ;:* Initialise aucTeX
 (require 'tex-site)
-;; Latest auctex causes a split window on (S)XEmacs start up without
-;; this defvaralias because of a defadvice in tex.el
-(defvaralias 'minor-mode-list 'minor-mode-alist)
 (require 'latex)
 (require 'reftex)
 (require 'reftex-vars)
 (require 'latex-units)
-;; loading the .elc causes byte-optimiser warnings. No doubt it is
-;; incompatible GNUisms of some kind.  Explicitly loading the .el gets
-;; around it.
-(require 'font-latex "font-latex.el")
+(require 'font-latex)
 (require 'latex-toolbar)
 
+;:*=======================
+;:* auto-mode-alist
+;; LaTeX or latex ???  It doesn't really matter because LaTeX-mode is
+;; an alias to latex-mode, I just prefer the former name and like to
+;; keep things less messy.
+;;
+;; Remove the ones set from tex-mode.el in the texinfo pkg that use
+;; latex-mode
+(remove-alist 'auto-mode-alist "\\.\\(?:sty\\|cls\\|bbl\\)\\'")
+(remove-alist 'auto-mode-alist "\\.[tT]e[xX]\\'")
+(remove-alist 'auto-mode-alist "\\.ltx\\'")
+;; Add them back for LaTeX-mode
+(add-to-list 'auto-mode-alist '("\\.\\(?:sty\\|cls\\|bbl\\)\\'" . LaTeX-mode))
+(add-to-list 'auto-mode-alist '("\\.[tT]e[xX]\\'" . LaTeX-mode))
+(add-to-list 'auto-mode-alist '("\\.ltx\\'" . LaTeX-mode))
+(add-to-list 'auto-mode-alist '("\\.drv\\'" . LaTeX-mode))
+;; doctex
+(add-to-list 'auto-mode-alist '("\\.dtx\\'" . doctex-mode))
+
 ;:*=======================
 ;:* Shutup the byte-compiler
 (defvar ispell-extra-args)
@@ -216,6 +229,8 @@ Replacement for count-lines-region."
                 TeX-run-command nil t))
   (when (device-on-window-system-p)
     (outl-mouse-minor-mode 1)
+    ;; I can't get my extra toolbar to display from the hook, I don't
+    ;; yet know why, so instead I bind `S-H-t' locally to load it.
     (local-set-key [(super hyper t)] #'sy-LaTeX-toolbar)))
 
 (add-hook 'LaTeX-mode-hook #'sy-LaTeX-mode-hook 'append)

diff --git a/06-tex-site-sy.el b/06-tex-site-sy.el
deleted file mode 100644 (file)
index 564ad59..0000000
--- a/06-tex-site-sy.el
+++ /dev/null
@@ -1,118 +0,0 @@
-;; 06-tex-site-sy.el --- Because AUCTeX is stupid   -*- Emacs-Lisp -*-
-
-;; Copyright (C) 2007 - 2020 Steve Youngs
-
-;;     Author: Steve Youngs <steve@sxemacs.org>
-;; Maintainer: Steve Youngs <steve@sxemacs.org>
-;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Mar 19, 2020 10:58:18 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 https://git.sxemacs.org/syinit
-;;   Keywords: init, compile
-
-;; This file is part of SYinit
-
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions
-;; are met:
-;;
-;; 1. Redistributions of source code must retain the above copyright
-;;    notice, this list of conditions and the following disclaimer.
-;;
-;; 2. Redistributions in binary form must reproduce the above copyright
-;;    notice, this list of conditions and the following disclaimer in the
-;;    documentation and/or other materials provided with the distribution.
-;;
-;; 3. Neither the name of the author nor the names of any contributors
-;;    may be used to endorse or promote products derived from this
-;;    software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
-;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-;; DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-;; FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-;; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-;; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-;; OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-;; IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-;;; Commentary:
-;;
-;;   This is just because the tex-site.el you get in the XEmacs AUCTeX
-;;   package is nuts.
-
-;;; Credits:
-;;
-;;   The HTML version of this file was created with Hrvoje Niksic's
-;;   htmlize.el which is part of the XEmacs "text-modes" package.
-;;
-
-;;; Todo:
-;;
-;;     
-
-;;; Code:
-(if (< emacs-major-version 21)
-  (error "AUCTeX requires Emacs 21 or later"))
-
-(defvar no-doc
-  "This function is part of AUCTeX, but has not yet been loaded.
-Full documentation will be available after autoloading the function."
-  "Documentation for autoload functions.")
-
-(setq TeX-image-directory
-      (file-name-as-directory
-       (expand-file-name "images" (locate-data-directory "auctex"))))
-
-;; System-wide writable directories are a bad idea at the best of
-;; times.  Pretty much the only way of doing it even remotely safely
-;; is to use 1777 perms on the directory.  Until I update AUCTeX to do
-;; just that this var will default to nil unless it is writable to me.
-(setq TeX-auto-global
-      (let ((dir (file-name-as-directory
-                 (expand-file-name "auto"
-                                   (locate-data-directory "auctex")))))
-       (or (and (file-writable-p dir) dir)
-           ;; If it doesn't exist but parent is writable, allow it.
-           (and (file-writable-p (file-dirname dir)) dir))))
-
-;:*=======================
-;:* LaTeX or latex ???
-;; Remove the built-in ones that use latex-mode
-(remove-alist 'auto-mode-alist "\\.\\(?:sty\\|cls\\|bbl\\)\\'")
-(remove-alist 'auto-mode-alist "\\.[tT]e[xX]\\'")
-(remove-alist 'auto-mode-alist "\\.ltx\\'")
-;; Add them back for LaTeX-mode
-(add-to-list 'auto-mode-alist '("\\.\\(?:sty\\|cls\\|bbl\\)\\'" . LaTeX-mode))
-(add-to-list 'auto-mode-alist '("\\.[tT]e[xX]\\'" . LaTeX-mode))
-(add-to-list 'auto-mode-alist '("\\.ltx\\'" . LaTeX-mode))
-(add-to-list 'auto-mode-alist '("\\.drv\\'" . LaTeX-mode))
-;; doctex
-(add-to-list 'auto-mode-alist '("\\.dtx\\'" . doctex-mode))
-
-;; This hook will store bibitems when you save a BibTeX buffer.
-(add-hook 'bibtex-mode-hook 'BibTeX-auto-store)
-(autoload 'BibTeX-auto-store "latex" no-doc t)
-
-(autoload 'tex-mode "tex" no-doc t)
-(autoload 'plain-tex-mode "tex" no-doc t)
-(autoload 'ams-tex-mode "tex" no-doc t)
-(autoload 'context-mode "context" no-doc t)
-(autoload 'doctex-mode "latex" no-doc t)
-(autoload 'TeX-auto-generate "tex" no-doc t)
-(autoload 'TeX-auto-generate-global "tex" no-doc t)
-(autoload 'TeX-insert-quote "tex" no-doc t)
-(autoload 'TeX-submit-bug-report "tex" no-doc t)
-(autoload 'japanese-plain-tex-mode "tex-jp" no-doc t)
-(autoload 'japanese-latex-mode "tex-jp" no-doc t)
-(autoload 'latex-mode "latex" no-doc t)
-(autoload 'LaTeX-mode "latex" no-doc t)
-(autoload 'TeX-latex-mode "latex" no-doc t)
-
-;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-(message "Sane tex-site loaded successfully")
-

diff --git a/07-html-sy.el b/07-html.el
similarity index 64%
rename from 07-html-sy.el
rename to 07-html.el
index da7f80d..c1f60f8 100644 (file)
--- a/07-html-sy.el
+++ b/07-html.el
@@ -1,13 +1,13 @@
-;; 07-html-sy.el --- HTML settings   -*- Emacs-Lisp -*-
+;; 07-html-sy.el --- HTML settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 13:05:05 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/07-html-sy.html>
+;; Time-stamp: <Friday Apr 10, 2020 15:14:04 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits/>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/07-html.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -111,10 +111,7 @@
 ;:*=======================
 ;:* Hrvoje Niksic's htmlize
 ;;
-;;  `htmlize.el' comes with the "text-modes" XEmacs package, or you
-;;  can get the latest version from:
-;;
-;;      <http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el>.
+;;  `htmlize.el' comes with the "text-modes" SXEmacs package.
 ;;
 ;;  `htmlize.el' is a lovely piece of code for converting Emacs buffers
 ;;  into HTML.  The default settings should be fine for most people most
@@ -124,54 +121,26 @@
 (eval-and-compile
   (require 'htmlize))
 
-;; Those "local-variables" declarations you sometimes see at the bottom
-;; of source files can cause quite a bit of havoc when it comes to
-;; "htmlize'ing" them.  Basically what happens is that when you go to
-;; save the resulting HTML buffer XEmacs goes into an infinite loop
-;; complaining about bad local vars.  I get around it with this next
-;; function which just a simple wrapper for `htmlize-buffer'.
-(defun sy-htmlize-buffer (&optional buffer)
-  "This is just a simple wrapper for `htmlize-buffer'.
-
-All it does is scan the buffer to be converted for any local variable
-declarations and replaces them with a place holder.  This prevents an
-infloop when you go to save the resulting HTML buffer.
-
-Original `htmlize-buffer' doc string:
-
-Convert buffer to HTML, preserving the font-lock colorization.
-The generated HTML is available in a new buffer, which is returned.
-When invoked interactively, the new buffer is selected in the
-current window."
-  (interactive)
-  (let ((htmlbuf (with-current-buffer (or buffer (current-buffer))
-                  (goto-char (point-min))
-                  (while (re-search-forward
-                          ;; This concat is deliberately split accross
-                          ;; 4 lines for a reason.  Don't change it!
-                          (concat "^" 
-                                  comment-start 
-                                  "Local"
-                                  " Variables:$") nil t)
-                    (replace-match 
-                     (concat comment-start
-                             " Put the normal local variables declaration here")))
-                  (htmlize-buffer-1)
-                  ;; Undo that replace-match.
-                  (when (buffer-modified-p)
-                    (undo)))))
-    (when (interactive-p)
-      (switch-to-buffer htmlbuf))
-    htmlbuf))
-
-;; Use my function by default.
-(defalias 'htmlize-buffer 'sy-htmlize-buffer)
+;; File-local variables can cause problems so this advice simply
+;; disables them when htmlize runs.
+(defadvice htmlize-buffer (around nolocals (&rest args) activate)
+  "Turn off file local variables during htmlize-buffer."
+  (let ((enable-local-variables nil)
+       buf)
+    (setq buf ad-do-it)
+    (when (interactive-p) (switch-to-buffer buf))))
+
+;; By default htmlize would turn 'file.el' into 'file.el.html', I
+;; prefer that it turned it into 'file.html'.  That's what this advice
+;; does.
+(defadvice htmlize-make-file-name (before filename activate)
+  "Prefer filenames \"file.ext\" -> \"file.html\"."
+  (setq file (file-name-sans-extension file)))
 
 ;; This function, run from `htmlize-after-hook' lets me embed HTML
 ;; comments inside normal source comments and also allows me to set up
-;; relative hyperlinks.  It has been hand-massaged after htmlizing to
-;; get the desired results for its doc string.
-(defun sy-htmlize-after-hook ()
+;; relative hyperlinks.
+(defun sy-htmlize-set-links ()
   "Function run from `htmlize-after-hook'.
 
 It takes care of any relative hyperlinks and also dequotes any HTML
@@ -181,59 +150,65 @@ Relative hyperlinks need to be prepared in a particular way in the
 file that is to be converted to HTML.  For example, in an emacs lisp
 file you might see:
 
-Get the latest rls=/src/foo.el;rld=version here;rle.
+    Get the latest rls=/src/foo.el;rld=version here;rle.
 
 Which would be converted to:
 
-Get the latest <a href=\"/src/foo.el\">version here</a>."
-  (save-excursion
-    (goto-char (point-min))
-    (mapcar
-     '(lambda (x) (save-excursion (eval x)))
-     '((replace-string "rls=" "<a href=\"")
-       (replace-string ";rld=" "\">")
-       (replace-string ";rle" "</a>")
-       (replace-string "&lt;!--" "<!--")
-       (replace-string "--&gt;" "-->")))))
+    Get the latest <a href=\"/src/foo.el\">version here</a>."
+  ;; LOL, we actually need to _NOT_ do it in _this_ file so the doc
+  ;; string for this function looks right.
+  (unless (string-match "07-html" (buffer-name htmlbuf))
+    (save-excursion
+      (goto-char (point-min))
+      (mapcar
+       '(lambda (x) (save-excursion (eval x)))
+       '((replace-string "rls=" "<a href=\"")
+        (replace-string ";rld=" "\">")
+        (replace-string ";rle" "</a>")
+        (replace-string "&lt;!--" "<!--")
+        (replace-string "--&gt;" "-->"))))))
 
 ;; I know that the pages generated by `htmlize.el' are valid HTML/CSS and
 ;; are created by SXEmacs.  So I announce the fact by adding the appropriate
 ;; logos to the bottom of the page, together with a copyright notice.  This
 ;; is the raw HTML for that.
 (defconst sy-htmlize-appendix
-  (concat "<!--  Logos -->
-<p>
-<br>
-<!--  SXEmacs Logo -->
-    <a href=\"http://www.sxemacs.org/\">
-<img style=\"border:0;width:88px;height:31px\"
-     src=\"/~steve/images/cbsx.png\" 
-     alt=\"Created with SXEmacs\"></a>
+  (concat "<!--  SXEmacs Logo -->
+    <div class=\"img\">
+      <a href=\"https://www.sxemacs.org/\">
+       <img style=\"padding:0px 5px 0px 0px;border:0;width:88px;height:31px\"
+         src=\"/Images/cbsx.png\"
+         title=\"This page was created entirely in SXEmacs\"
+         alt=\"Created with SXEmacs\">
+      </a>
 <!--  End SXEmacs Logo -->
 
 <!--  Valid XHTML 1.0 / CSS -->
       <a href=\"http://validator.w3.org/check/referer\">
-        <img style=\"border:0;width:88px;height:31px\"
-          src=\"/~steve/images/valid-html401.png\"
-          alt=\"Valid HTML 4.01 Strict!\"></a>
- <a href=\"http://jigsaw.w3.org/css-validator/check/referer\">
-  <img style=\"border:0;width:88px;height:31px\"
-       src=\"/~steve/images/vcss.png\" 
-       alt=\"Valid CSS!\">
- </a>
+        <img style=\"padding:0px 5px 0px 10px;border:0;width:88px;height:31px\"
+         src=\"/Images/valid-html401.png\"
+         title=\"Valid HTML 4.01 Strict!\"
+         alt=\"Valid HTML 4.01 Strict!\">
+      </a>
+      <a href=\"http://jigsaw.w3.org/css-validator/check/referer\">
+       <img style=\"padding:0px 0px 0px 5px;border:0;width:88px;height:31px\"
+         src=\"/Images/vcss.png\"
+         title=\"Valid CSS!\" alt=\"Valid CSS!\">
+      </a>
+    </div>
 </p>
 <!--  End Valid HTML / CSS-->
 
     <h6>Copyright &#169; "
-         (format-time-string "%Y")
-         " Steve Youngs<br>
+         (format-time-string "%Y") " Steve Youngs<br>
      Verbatim copying and distribution is permitted in any medium,
     providing this notice is preserved.<br>
 <!-- hhmts start -->
 <!-- hhmts end -->
    </h6>
 
-"))
+"
+))
 
 ;; Appends the above to each page.  Run from `htmlize-after-hook'.
 (defun sy-htmlize-append ()
@@ -264,24 +239,31 @@ Get the latest <a href=\"/src/foo.el\">version here</a>."
         background-color: #FD00FD;
         text-decoration: underline;
       }
+      .img a:hover {
+        background-color: #000000;
+        text-decoration: none;
+      }
 ")
 
-
 ;; Hooks
+(defvar sy-htmlize-this-file nil
+  "The name of the file we htmlize'd.")
 (defun sy-htmlize-before-hook ()
   "Prepares the buffer for htmlising.
 Turns off howm-mode as it can play havoc with the font-locking, and we
 force a fontify of the buffer."
-  (progn
-    (and howm-mode
-        (turn-off-howm-mode))
-    (font-lock-fontify-buffer)))
+  (setq sy-htmlize-this-file (buffer-file-name))
+  (and howm-mode (howm-mode 0))
+  (font-lock-fontify-buffer))
+
+(defun sy-htmlize-after-hook ()
+  (sy-htmlize-set-links)
+  (sy-htmlize-append)
+  (with-current-buffer (get-file-buffer sy-htmlize-this-file)
+    (normal-mode)) ; Will turn howm-mode back on if it was off
+  (setq sy-htmlize-this-file nil))
 
 (add-hook 'htmlize-before-hook #'sy-htmlize-before-hook)
-(add-hook 'htmlize-after-hook 
-         #'(lambda ()
-             (sy-htmlize-after-hook)
-             (sy-htmlize-append)
-             (font-lock-fontify-buffer)))
+(add-hook 'htmlize-after-hook #'sy-htmlize-after-hook)
 ;:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::*
-(message "hm--html-mode initialised")
+(message "HTML settings initialised")

diff --git a/08-sounds-sy.el b/08-sounds.el
similarity index 92%
rename from 08-sounds-sy.el
rename to 08-sounds.el
index fb2786f..5d60230 100644 (file)
--- a/08-sounds-sy.el
+++ b/08-sounds.el
@@ -1,13 +1,13 @@
-;; 08-sounds-sy.el --- Sound set up   -*- Emacs-Lisp -*-
+;; 08-sounds.el --- Sound set up
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 13:33:32 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/08-sounds-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 07:39:34 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/08-sounds.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/09-toolbar-sy.el b/09-toolbar.el
similarity index 93%
rename from 09-toolbar-sy.el
rename to 09-toolbar.el
index 91ce541..321acb6 100644 (file)
--- a/09-toolbar-sy.el
+++ b/09-toolbar.el
@@ -1,13 +1,13 @@
-;; 09-toolbar-sy.el --- Toolbar set up   -*- Emacs-Lisp -*-
+;; 09-toolbar.el --- Toolbar set up
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Mar 19, 2020 12:47:15 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/09-toolbar-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 07:43:09 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/09-toolbar.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/10-pkgs-sy.el b/10-pkgs.el
similarity index 95%
rename from 10-pkgs-sy.el
rename to 10-pkgs.el
index a6b6ad7..71c5f6b 100644 (file)
--- a/10-pkgs-sy.el
+++ b/10-pkgs.el
@@ -1,13 +1,13 @@
-;; 10-pkgs-sy.el --- Various XE Package Settings   -*- Emacs-Lisp -*-
+;; 10-pkgs.el --- Various XE Package Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Mar 19, 2020 12:15:35 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/10-pkgs-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 07:58:14 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/10-pkgs.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -183,7 +183,7 @@
   (require 'savehist)
   (setq savehist-file (expand-file-name "history" user-init-directory))
   (setq savehist-coding-system
-       (coding-system-name (find-coding-system 'iso-8859-1)))
+       (coding-system-name (find-coding-system 'utf-8)))
   (savehist-mode 1))
 
 ;:*======================
@@ -213,7 +213,7 @@
 (global-set-key '(control f12)  'comment-or-uncomment-region)
 (global-set-key '(meta f12) 'comment-or-uncomment-region)
 
-;;; FIXME: <<< SXEInits
+;;; FIXME: SXEInits
 ;:*======================
 ;:* parens that mark sexpressions
 (require 'paren)
@@ -244,8 +244,8 @@
 
 ;:*======================
 ;:* Speedbar
-;;; FIXME: <<< Speedbar Tooltips
-;;; >>> ~/programming/SXEmacs/packages/xemacs-packages/speedbar/speedbar.el
+;;; FIXME:  Speedbar Tooltips
+;;; snap:///${XPKGS}/speedbar/speedbar.el
 (setq
  speedbar-query-confirmation-method 'none-but-delete
  speedbar-show-unknown-files t
@@ -287,7 +287,7 @@
 (setq speedbar-frame-plist
       (plist-put speedbar-frame-plist 'width 25))
 
-;; FIXME: see... <<< PKGFix
+;; FIXME: see... PKGFix
 ;; Try to load the speedbar on the right of the current frame
 (defalias 'dframe-reposition-frame-xemacs 'dframe-reposition-frame-emacs)
 (setq speedbar-default-position 'right)
@@ -544,7 +544,7 @@
 ;; winmgr-mode uses, so nuke winmgr-mode from auto-mode-alist
 (remove-alist 'auto-mode-alist "\\.[^/]*wm2?\\(?:rc\\)?\\'")
 
-;; The howm people are stupid, they bind C-h to scroll-down
+;; The howm people are nuts, they bind C-h to scroll-down
 ;; Get rid of it and replace with DEL and BACKSPACE
 (define-key howm-menu-mode-map "\C-h" nil)
 (define-key howm-menu-mode-map [delete] #'scroll-down)
@@ -560,6 +560,7 @@
 (global-set-key [(control ?c) ?t] #'howm-list-active-todo)
 
 ;; Another problem with howm... it fucks up window configuration
+;; Advice time!
 (defadvice howm-keyword-search (before howm-save-kw (&rest args) activate)
  "Save window configuration before viewing howm buffers."
  (window-configuration-to-register ?h))
@@ -592,7 +593,8 @@
   (howm-mode 1))
 
 (defun turn-off-howm-mode ()
-  (howm-mode 0))
+  (howm-mode 0)
+  (font-lock-mode))
 
 ;; Turn it on where I need it
 (add-hook 'lisp-interaction-mode-hook #'turn-on-howm-mode)
@@ -602,23 +604,15 @@
 (add-hook 'sh-mode-hook #'turn-on-howm-mode)
 ;; You gotta be fooking kidding me, this prevents lisp-initd.el from
 ;; compiling the generated .el (moved to init.el)
-;;;;; (add-hook 'emacs-lisp-mode-hook #'turn-on-howm-mode)
+;; (add-hook 'emacs-lisp-mode-hook #'turn-on-howm-mode)
 
 ;; Turn it off where I don't
+;; I actually would love to have howm in all of these modes, but I
+;; cannot get the font-locking working properly with it on
 (add-hook 'html-mode-hook #'turn-off-howm-mode)
 (add-hook 'texinfo-mode-hook #'turn-off-howm-mode)
-
-;; Various other howm problem fixes
-
-;; I'm having a big problem with howm/font-lock/message-mode playing
-;; nicely together.  This gives me font-locking in message-mode, plus
-;; howm functionality, but no howm font-locking.  I can live without
-;; howm font-lock in one buffer.
-(add-hook 'message-mode-hook #'(lambda ()
-                                (font-lock-mode)
-                                (font-lock-mode)))
-;; ChangeLogs
-(add-hook 'change-log-mode-hook #'font-lock-mode)
+(add-hook 'message-mode-hook #'turn-off-howm-mode)
+(add-hook 'change-log-mode-hook #'turn-off-howm-mode)
 
 ;:*=====================
 ;:* snap!
@@ -633,8 +627,8 @@
 
 ;; env var trickery.
 (setq snap-abbreviate-environment-variables
-      '("EMCHAT" "JAVA_HOME" "LISP" "PKGS" "QTDIR"
-       "SXEBLD" "SXESITE" "SXEWD" "SYdrive" "SYdrop" "HOME"))
+      '("EMCHAT" "JAVA_HOME" "EL" "XPKGS" "MPKGS" "PKGS" "QTDIR"
+       "BLDS" "SXESITE" "SXEWD" "SYdrive" "SYdrop" "HOME"))
 
 (defadvice snap-abbreviate-file-name (around env-var (raw-path) activate)
   ad-do-it

diff --git a/11-cal-sy.el b/11-cal.el
similarity index 97%
rename from 11-cal-sy.el
rename to 11-cal.el
index 3274686..82ab0d7 100644 (file)
--- a/11-cal-sy.el
+++ b/11-cal.el
@@ -1,13 +1,13 @@
-;; 11-cal-sy.el --- Calendar Settings   -*- Emacs-Lisp -*-
+;; 11-cal.el --- Calendar Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Feb 20, 2020 08:23:46 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/11-cal-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 08:12:34 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/11-cal.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -595,13 +595,17 @@ Ever-so-slightly modified to include the Easter Monday holiday."
 
 ;:*=======================
 ;:* timeclock
+;;  I tried using it for a while but I found that because it wasn't
+;;  automated I never remembered to "clock-in" or "clock-out" and
+;;  change tasks.  I would probably use it if it were a lot more like
+;;  xwem-worklog.
 ;;
 ;; Track time spent doing certain things
-(require 'timeclock)
-(setq timeclock-file (expand-file-name "timelog" user-init-directory))
-(setq timeclock-relative nil)
-(add-hook 'kill-emacs-query-functions 'timeclock-query-out)
-(timeclock-modeline-display)
+;; (require 'timeclock)
+;; (setq timeclock-file (expand-file-name "timelog" user-init-directory))
+;; (setq timeclock-relative nil)
+;; (add-hook 'kill-emacs-query-functions 'timeclock-query-out)
+;; (timeclock-modeline-display)
 
 (define-key ctl-x-map "ti" 'timeclock-in)
 (define-key ctl-x-map "to" 'timeclock-out)
@@ -614,7 +618,6 @@ Ever-so-slightly modified to include the Easter Monday holiday."
 
 ;:*=======================
 ;:* Start itimer to refresh just after midnight
-;; <<< run-at-time
 ;; This needs my `future-run-at-time' advice.
 (run-at-time "00:01" 86400 #'redraw-calendar)
 

diff --git a/12-misc-sy.el b/12-misc.el
similarity index 94%
rename from 12-misc-sy.el
rename to 12-misc.el
index 174b869..25ff80b 100644 (file)
--- a/12-misc-sy.el
+++ b/12-misc.el
@@ -1,13 +1,13 @@
-;; 12-misc-sy.el --- Miscellaneous Settings   -*- Emacs-Lisp -*-
+;; 12-misc --- Miscellaneous Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Friday Mar 20, 2020 05:24:51 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/12-misc-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 18:46:14 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/12-misc.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -85,7 +85,7 @@
 ;:*=======================
 ;:* Keep the mouse pointer away from the text cursor
 (require 'avoid)
-(mouse-avoidance-mode 'jump)
+(mouse-avoidance-mode 'banish)
 
 ;:*======================= 
 ;:* Frame title.
@@ -193,7 +193,7 @@
 ;:* VI-style matching parenthesis
 ;:  From Eric Hendrickson edh @ med.umn.edu
 (defun match-paren (arg)
-  "Go to the matching parenthesis if on parenthesis otherwise insert %."
+  "Go to the matching parenthesis if on parenthesis."
   (interactive "p")
   (cond ((looking-at "[([{]") (forward-sexp 1) (backward-char))
         ((looking-at "[])}]") (forward-char) (backward-sexp 1))))
@@ -223,7 +223,14 @@
 ;; Needed to load this earlier for some reason that I have long since
 ;; forgotten, so it is now in 01-vars-sy.el
 ;;(require 'ffi-wand)
-(Wand-find-file-enable)
+
+;; If you want to use #'Wand-display whenever you C-x C-f imagefile
+;; uncomment this.  It's cool and all, but there are definitely times
+;; when you don't want to view images with #'Wand-display.  Editing
+;; XPM files for example.  Have you seen xpm-mode? it's awesome.
+;(Wand-find-file-enable)
+;; But sometimes you do want it so...
+(global-set-key [(super ?x) (super ?f)] #'Wand-display)
 
 ;:*=======================
 ;:* ffi-magic
@@ -336,13 +343,15 @@
 
 ;:*======================
 ;:* from.el - check whose sent us mail
+;; Not that much use anymore now that most of my mail is via IMAP so
+;; doesn't go through my local server or spool.
 (require 'from)
 (setq 
  from-mailspools '("~/mail/INBOX")
  from-use-other-window nil
  from-quit-command 'kill-buffer
  from-highlight-regexp
- #r"Merge-Req\|e\(icq\|mchat\)\|pa\(?:ckages\|tch\)\|sxemacs\|x\(?:e\(?:macs\|tla\)\|wem\)")
+ #r"Merge-Req\(?:uest\)?\|P\(?:-Req\|atch\|ull-Req\)\|SXEmacs\|patch")
 
 ;:*======================
 ;:* PS-Print
@@ -368,12 +377,19 @@
 ;:*======================
 ;:* Sane ChangeLogs
 (when (featurep 'mule)
+  ;; Cater for the majority of the World who don't have names and
+  ;; languages that fit nicely into US-ASCII.
   (add-to-list 'file-coding-system-alist
-              (cons "ChangeLog.[[:alnum:]]+" '(utf-8 . utf-8))))
+              (cons "ChangeLog\\(.?[[:alnum:][:punct:]]+\\)?"
+                    '(utf-8 . utf-8))))
 
-(add-to-list 'auto-mode-alist 
-            '("ChangeLog[\\.-][[:alnum:]]+" . change-log-mode))
+;; Try to have even the oddly named ChangeLogs in change-log-mode
+(add-to-list
+ 'auto-mode-alist 
+ '("ChangeLog\\(.?[[:alnum:][:punct:]]+\\)?" . change-log-mode))
 
+;; My sy-git.el has nice font-locking for git logs, so use it outside
+;; of sy-git-mode as well.
 (defun sy-change-log-mode-hook ()
   (save-excursion
     (when (re-search-forward "^commit [0-9a-f]+" 1000 t)
@@ -382,9 +398,9 @@
 
 (add-hook 'change-log-mode-hook #'sy-change-log-mode-hook)
 
-
 ;:*======================
 ;:* Directory Abbrevs
+;;  Love this.  It saves me so much time.
 (setq directory-abbrev-alist
       `(("^/instcore" . ,(concat (car emacs-roots)
                                "share/sxemacs-"
@@ -569,7 +585,9 @@
        (name . "InfoFrame")
        (menubar-visible-p . nil)
        (default-toolbar-visible-p . t)
-       (default-gutter-visible-p . t)))
+       ;; I have a idea to put nav buttons in the gutter.
+       (default-gutter-visible-p . t)
+       (top-gutter-height . 24)))
 
 (unless (fboundp 'Info-search-next)
   (defun Info-search-next ()
@@ -812,7 +830,7 @@ It ignores punctuation."
 ;;  deal with it.
 ;;
 ;;  I now have my init files named with a 2 digit numerical prefix.
-;;  This is that I can control which order `lisp-initd-compile-and-load'
+;;  This is so I can control which order `lisp-initd-compile-and-load'
 ;;  will load my stuff.  Consequently, finding a particular init file is
 ;;  much harder now because I can never remember what bloody number it
 ;;  has.  This takes the remembering out of the equation.
@@ -855,6 +873,7 @@ files are assigned what numbers."
     (find-file-other-window expanded codesys)))
 
 (global-set-key [(control ?x) ?4 ?i] #'sy-init-file-other-window)
+
 ;:*=======================
 ;:* "Active" menubar
 ;; Nifty little thing that hides the menubar and makes it visible when
@@ -865,6 +884,9 @@ files are assigned what numbers."
 
 ;:*=======================
 ;:* LiveJournal posting thingy
+;;  Sadly, this no longer works because I neglected to keep it up to
+;;  date with LiveJournal API changes.  But it was damn cool while it
+;;  lasted.
 (require 'lj)
 ;(setq lj-cookie-flavour 'chrome)
 (setq lj-cookie-flavour 'firefox)

diff --git a/13-bbdb-sy.el b/13-bbdb.el
similarity index 95%
rename from 13-bbdb-sy.el
rename to 13-bbdb.el
index ab1c80a..d925802 100644 (file)
--- a/13-bbdb-sy.el
+++ b/13-bbdb.el
@@ -1,13 +1,13 @@
-;; 13-bbdb-sy.el --- Big Brother DataBase (BBDB)   -*- Emacs-Lisp -*-
+;; 13-bbdb.el --- Big Brother DataBase (BBDB)
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 14:46:05 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/13-bbdb-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 18:51:53 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/13-bbdb.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/14-fonts-sy.el b/14-fonts.el
similarity index 96%
rename from 14-fonts-sy.el
rename to 14-fonts.el
index 8eeb910..52ba892 100644 (file)
--- a/14-fonts-sy.el
+++ b/14-fonts.el
@@ -1,13 +1,13 @@
-;; 14-fonts-sy.el --- Fonts/Faces Settings   -*- Emacs-Lisp -*-
+;; 14-fonts.el --- Fonts/Faces Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Thursday Mar 19, 2020 11:11:22 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/14-fonts-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 18:53:24 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/14-fonts.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -63,10 +63,10 @@
 ;:*=======================
 ;:* Turn on Lazy-(lock|shot)
 ;;; Lazy-lock
-;; (require 'lazy-lock)
+(require 'lazy-lock)
 ;; (if (eq emacs-minor-version 5)
 ;;     (setq font-lock-support-mode 'lazy-lock-mode)
-;;  (add-hook 'font-lock-mode-hook 'turn-on-lazy-lock))
+(add-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
 ;; (setq lazy-lock-stealth-time 15)
 
 ;;; Lazy-shot (my preference)
@@ -76,14 +76,14 @@
 ;; (add-hook 'font-lock-mode-hook 'turn-on-lazy-shot)
 
 ;;; Fast-lock (it has caching!)
-(require 'fast-lock)
-(setq fast-lock-cache-directories
-      (list (paths-construct-path (list (getenv "XDG_CACHE_HOME")
-                                       "sxemacs" "fast-lock"))))
-(push 'save-buffer fast-lock-save-events)
-(fast-lock-mode 1)
-(add-hook 'font-lock-mode-hook 'turn-on-fast-lock)
-(setq-default fast-lock-mode t)
+;; (require 'fast-lock)
+;; (setq fast-lock-cache-directories
+;;       (list (paths-construct-path (list (getenv "XDG_CACHE_HOME")
+;;                                     "sxemacs" "fast-lock"))))
+;; (push 'save-buffer fast-lock-save-events)
+;; (fast-lock-mode 1)
+;; (add-hook 'font-lock-mode-hook 'turn-on-fast-lock)
+;; (setq-default fast-lock-mode t)
 
 ;:*=======================
 ;:* describe-face-at-point, a function to find out which face is which
@@ -322,6 +322,7 @@
      (message-header-xheader ((t (:foreground "blue"))))
      (message-mml ((t (:foreground "ForestGreen"))))
      (message-separator ((t (:bold t :foreground "yellow"))))
+     (mm-uu-extract ((t (:background "black"))))
      ;; MMM-mode
      (mmm-default-submode-face ((t (:background "black"))))
      ;; Hyper-apropos.

diff --git a/15-supercite-sy.el b/15-supercite.el
similarity index 74%
rename from 15-supercite-sy.el
rename to 15-supercite.el
index ac7b3a9..0c2fc47 100644 (file)
--- a/15-supercite-sy.el
+++ b/15-supercite.el
@@ -1,13 +1,13 @@
-;; 15-supercite-sy.el --- Mail citing Settings   -*- Emacs-Lisp -*-
+;; 15-supercite.el --- Mail citing Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Wednesday Feb 12, 2020 14:51:28 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/15-supercite-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 19:00:53 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/15-supercite.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -58,30 +58,23 @@
 ;;; Code:
 (require 'supercite)
 (require 'time-date)
-
-;; There is a screw-up in the Gnus autoloads that prevents this from
-;; being autoloaded
-(defun time-to-seconds (time)
-  "Convert time value TIME to a floating point number."
-  (with-decoded-time-value ((high low micro pico type time))
-                          (+ (* 1.0 high 65536)
-                             low
-                             (/ (+ (* micro 1e6) pico) 1e12))))
-
+;; Warning: This triggers a bug that has been fixed in an as yet to be
+;; released SXEmacs Gnus package.  Sorry.  I will get the packages out
+;; as soon as I can.  This was as of: [2020-04-09]
 (defun sy-september-citation-line ()
   (let ((sc-mumble "")
        (whofrom (sc-whofrom)))
-    (if whofrom
-       (insert sc-reference-tag-string
-               (sc-hdr "On "
-                       (int-to-string
-                        (-
-                         (time-to-days (mail-header-parse-date
-                                        (sc-mail-field "date")))
-                         (time-to-days (encode-time 0 0 0 01 09 1993))))
-                       " September 1993, ")
-               (sc-mail-field "sc-author")
-               " wrote:\n"))))
+    (when whofrom
+      (insert
+       sc-reference-tag-string
+       (sc-hdr "On "
+              (int-to-string
+               (- (time-to-days (mail-header-parse-date
+                                 (sc-mail-field "date")))
+                  (time-to-days (encode-time 0 0 0 01 09 1993))))
+              " September 1993, ")
+       (sc-mail-field "sc-author")
+       " wrote:\n"))))
 
 (setq sc-rewrite-header-list 
       '((sc-no-header) 
@@ -96,28 +89,26 @@
        (sy-september-citation-line)))
 
 (setq sc-preferred-attribution-list
-      (list
-       '"sc-lastchoice"
-       "x-attribution"
-       "sc-consult"
-       "initials"
-       "firstname"
-       "emailname" 
-       "lastname"))
+      '("sc-lastchoice"
+       "x-attribution"
+       "sc-consult"
+       "initials"
+       "firstname"
+       "emailname"
+       "lastname"))
 
 (setq 
  message-cite-function 'sc-cite-original
  sc-confirm-always-p nil
- sc-preferred-header-style 8
- sc-auto-fill-region-p nil
- sc-fixup-whitespace-p nil
+ sc-preferred-header-style 4
+ sc-auto-fill-region-p t
+ sc-fixup-whitespace-p t
  sc-electric-references-p t
  sc-cite-blank-lines-p nil
- sc-nested-citation-p t
- sc-citation-leader "  "
+ sc-nested-citation-p nil
  sc-citation-separator " "
- sc-reference-tag-string ""
- sc-citation-delimiter "> "
+ sc-reference-tag-string "|--> "
+ sc-citation-delimiter ">"
  sc-extract-address-components 'gnus-extract-address-components)
 
 (defun sy-sc-remove-signature ()

diff --git a/16-riece-sy.el b/16-riece.el
similarity index 98%
rename from 16-riece-sy.el
rename to 16-riece.el
index d687685..a53c1bc 100644 (file)
--- a/16-riece-sy.el
+++ b/16-riece.el
@@ -1,13 +1,13 @@
-;; 16-riece-sy.el --- Riece (IRC) Settings   -*- Emacs-Lisp -*-
+;; 16-riece.el --- Riece (IRC) Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Sunday Mar  1, 2020 14:29:44 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/16-riece-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 19:11:39 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/16-riece.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 
@@ -89,9 +89,9 @@
       riece-ignore-discard-message nil
       riece-keywords
       '("Bastard" "EMchat" "eMoney" "Gnus" "LFS" "LinuxFromScratch"
-       "LineageOS" "LOS" "Lineage" "Pure Nexus"
-       "Linux From Scratch" "Riece" "SteveYoungs" "SXEmacs" "XEmacs"
-       "xwem")
+       "LineageOS" "Lineage" "Linux From Scratch" "Riece" "SteveYoungs"
+       "SXEmacs" "XEmacs" "Youngs" "Steve Youngs" "SYWriting"
+       "SY Writing" "Gaiman" "Neil Gaiman" "xwem")
       riece-layout '"bottom-right"
       riece-retry-with-new-nickname t
       riece-server-alist

diff --git a/17-emchat-sy.el b/17-emchat.el
similarity index 97%
rename from 17-emchat-sy.el
rename to 17-emchat.el
index c388dee..e3bfad5 100644 (file)
--- a/17-emchat-sy.el
+++ b/17-emchat.el
@@ -1,13 +1,13 @@
-;; 17-emchat-sy.el --- EMchat Settings   -*- Emacs-Lisp -*-
+;; 17-emchat.el --- EMchat Settings
 
 ;; Copyright (C) 2007 - 2020 Steve Youngs
 
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
-;; Time-stamp: <Friday Feb 14, 2020 01:48:44 steve>
-;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
-;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/17-emchat-sy.html>
+;; Time-stamp: <Thursday Apr  9, 2020 19:14:30 steve>
+;;   Download: <https://downloads.sxemacs.org/SYinits>
+;;   HTMLised: <https://www.sxemacs.org/SYinits/17-emchat.html>
 ;;   Git Repo: git clone https://git.sxemacs.org/syinit
 ;;   Keywords: init, compile
 

diff --git a/init-el b/init-el
index 41b91a0..6db848c 100644 (file)
--- a/init-el
+++ b/init-el
@@ -1,8 +1,8 @@
-;; -*- Emacs-Lisp -*-
+;; init.el --- My TopLevel SXEmacs init file.   -*- mode: emacs-lisp -*-
 ;;
 ;;; Personal SXEmacs configuration of Steve Youngs <steve@sxemacs.org>
 ;;
-;; Download this rls=../inits/init.el;rld=init.el source here;rle.
+;; Download this rls=https://downloads.sxemacs.org/SYinits/init.el;rld=init.el source here;rle.
 
 ;; This is my `user-init-file' (~/.config/sxemacs/init.el).  I like a
 ;; "modular" approach to things, so all this file does is load the
@@ -70,21 +70,20 @@
 ;; <!-- Ignore this mess, it is purely for the online HTML version of this file -->
 
 
-; rls=00-build.html;rld=Pre-Loads for byte-compiling the init files;rle: rls=../inits/00-build.el;rld=00-build.el;rle
-; rls=01-vars-sy.html;rld=Misc Variables;rle: rls=../inits/01-vars-sy.el;rld=01-vars-sy.el;rle
-; rls=02-keys-sy.html;rld=Key bindings;rle: rls=../inits/02-keys-sy.el;rld=02-keys-sy.el;rle
-; rls=03-c-mode-sy.html;rld=C-mode Settings;rle: rls=../inits/03-c-mode-sy.el;rld=03-c-mode-sy.el;rle
-; rls=04-w3-sy.html;rld=Emacs/W3 Settings;rle: rls=../inits/04-w3-sy.el;rld=04-w3-sy.el;rle
-; rls=05-latex-sy.html;rld=LaTeX Settings;rle: rls=../inits/05-latex-sy.el;rld=05-latex-sy.el;rle
-; rls=06-tex-site-sy.html;rld=Replace AUCTeX' tex-site.el;rle: rls=../inits/06-tex-site-sy.el;rld=06-tex-site-sy.el;rle
-; rls=07-html-sy.html;rld=HTML (coding) Settings;rle: rls=../inits/07-html-sy.el;rld=07-html-sy.el;rle
-; rls=08-sounds-sy.html;rld=Sound Settings;rle: rls=../inits/08-sounds-sy.el;rld=08-sounds-sy.el;rle
-; rls=09-toolbar-sy.html;rld=Toolbar Settings;rle: rls=../inits/09-toolbar-sy.el;rld=09-toolbar-sy.el;rle
-; rls=10-pkgs-sy.html;rld=Lots of XE packages Settings;rle: rls=../inits/10-pkgs-sy.el;rld=10-pkgs-sy.el;rle
-; rls=11-cal-sy.html;rld=Calendar/Diary Settings;rle: rls=../inits/11-cal-sy.el;rld=11-cal-sy.el;rle
-; rls=12-misc-sy.html;rld=Misc Stuff;rle: rls=../inits/12-misc-sy.el;rld=12-misc-sy.el;rle
-; rls=13-bbdb-sy.html;rld=BBDB Settings;rle: rls=../inits/13-bbdb-sy.el;rld=13-bbdb-sy.el;rle
-; rls=14-fonts-sy.html;rld=Pretty Colours;rle: rls=../inits/14-fonts-sy.el;rld=14-fonts-sy.el;rle
-; rls=15-supercite-sy.html;rld=Mail citing;rle: rls=../inits/15-supercite-sy.el;rld=15-supercite-sy.el;rle
-; rls=16-riece-sy.html;rld=Riece (IRC) Settings;rle: rls=../inits/16-riece-sy.el;rld=16-riece-sy.el;rle
-; rls=17-emchat-sy.html;rld=EMchat Settings;rle: rls=../inits/17-emchat-sy.el;rld=17-emchat-sy.el;rle
+; rls=00-build.html;rld=Pre-Loads for byte-compiling the init files;rle: rls=https://downloads.sxemacs.org/SYinits/00-build.el;rld=00-build.el;rle
+; rls=01-vars.html;rld=Misc Variables;rle: rls=https://downloads.sxemacs.org/SYinits/01-vars.el;rld=01-vars.el;rle
+; rls=02-keys.html;rld=Key bindings;rle: rls=https://downloads.sxemacs.org/SYinits/02-keys.el;rld=02-keys.el;rle
+; rls=03-c-mode.html;rld=C-mode Settings;rle: rls=https://downloads.sxemacs.org/SYinits/03-c-mode.el;rld=03-c-mode.el;rle
+; rls=04-w3.html;rld=Emacs/W3 Settings;rle: rls=https://downloads.sxemacs.org/SYinits/04-w3.el;rld=04-w3.el;rle
+; rls=05-latex.html;rld=LaTeX Settings;rle: rls=https://downloads.sxemacs.org/SYinits/05-latex.el;rld=05-latex.el;rle
+; rls=07-html.html;rld=HTML (coding) Settings;rle: rls=https://downloads.sxemacs.org/SYinits/07-html.el;rld=07-html.el;rle
+; rls=08-sounds.html;rld=Sound Settings;rle: rls=https://downloads.sxemacs.org/SYinits/08-sounds.el;rld=08-sounds.el;rle
+; rls=09-toolbar.html;rld=Toolbar Settings;rle: rls=https://downloads.sxemacs.org/SYinits/09-toolbar.el;rld=09-toolbar.el;rle
+; rls=10-pkgs.html;rld=Lots of XE packages Settings;rle: rls=https://downloads.sxemacs.org/SYinits/10-pkgs.el;rld=10-pkgs.el;rle
+; rls=11-cal.html;rld=Calendar/Diary Settings;rle: rls=https://downloads.sxemacs.org/SYinits/11-cal.el;rld=11-cal.el;rle
+; rls=12-misc.html;rld=Misc Stuff;rle: rls=https://downloads.sxemacs.org/SYinits/12-misc.el;rld=12-misc.el;rle
+; rls=13-bbdb.html;rld=BBDB Settings;rle: rls=https://downloads.sxemacs.org/SYinits/13-bbdb.el;rld=13-bbdb.el;rle
+; rls=14-fonts.html;rld=Pretty Colours;rle: rls=https://downloads.sxemacs.org/SYinits/14-fonts.el;rld=14-fonts.el;rle
+; rls=15-supercite.html;rld=Mail citing;rle: rls=https://downloads.sxemacs.org/SYinits/15-supercite.el;rld=15-supercite.el;rle
+; rls=16-riece.html;rld=Riece (IRC) Settings;rle: rls=https://downloads.sxemacs.org/SYinits/16-riece.el;rld=16-riece.el;rle
+; rls=17-emchat.html;rld=EMchat Settings;rle: rls=https://downloads.sxemacs.org/SYinits/17-emchat.el;rld=17-emchat.el;rle