change up skeletons and abbrevs

remove unused abbrevs, load skeletons in base init (not package specific), add
a more useful skel/abbrev.

diff --git a/abbrev_defs b/abbrev_defs
index 27427d76add1cc9f3ce7d056f5e98ec2ef8d6ac6..6e8b076c95408ceb2a1674d45698a9b63023598e 100644 (file)
--- a/abbrev_defs
+++ b/abbrev_defs
@@ -2,11 +2,7 @@
 (when (equal system-type 'windows-nt)
   (define-abbrev-table 'global-abbrev-table
     '(
-      ("hfac" "" howm-facility :count 0)
-      ("hper" "" howm-person :count 0)
+      ("wol" "" workorder-link :count 0)
       ("oelisp" "" skel-org-block-elisp :count 0)
-      ("ofac" "" skel-facility-properties :count 0)
-      ("oper" "" skel-person-properties :count 0)
       ("osrc" "" skel-org-block :count 0)
-      ("owo" "" skel-workorder-properties :count 0)
       )))

diff --git a/init.el b/init.el
index ac791e072262ca1ed324919221b0ca7bf64039e0..f7760e193a77c6759c53350dd606adc5bc0b23cd 100644 (file)
--- a/init.el
+++ b/init.el
@@ -24,7 +24,8 @@
          (lambda ()
            (require 're-repl-defuns)
            (require 're-pass-alike)
-           (require 're-dired-defuns)))
+           (require 're-dired-defuns)
+           (require 're-skeletons)))
 
 (add-to-list 'auto-mode-alist '("\\.keymap\\'" . c-mode))
 (add-to-list 'auto-mode-alist '("\\.dtsi\\'" . c-mode))

diff --git a/re/re-org-skeletons.el b/re/re-org-skeletons.el
deleted file mode 100644 (file)
index ec976de..0000000
--- a/re/re-org-skeletons.el
+++ /dev/null
@@ -1,58 +0,0 @@
-;;; re-org-skeletons.el -*- lexical-binding: t; -*-
-;; This file is not part of GNU Emacs
-
-;;; Code:
-(define-skeleton skel-org-block
-  "Insert an org source code block"
-  ""
-  "#+begin_src "
-  _ - "\n\n"
-  "#+end_src\n")
-
-(define-skeleton skel-org-block-elisp
-  "Insert an org emacs lisp block"
-  ""
-  "#+begin_src emacs-lisp\n"
-  _ - \n
-  "#+end_src\n")
-
-(define-skeleton skel-facility-properties
-  "Insert the structure for a new facility."
-  ""
-  "** "
-  _ - \n
-  "[[file:c:/projects/JOB]\n[Project Folder]]\n"
-  "[[file:t:/Job_Software/JOB]\n[T Drive]]\n"
-  "[[file:w:/_JOB]\n[Drawing Folder]]\n"
-  "*** System Notes\n"
-  "[[file:w:/_JOB/SEQUENCE OF OPERATIONS][Sequence of Operations]]\n"
-  "*** Before Startup\n"
-  "**** TODO Get Licenses      :licenses:\n"
-  "***** TODO Wonderware\n"
-  "***** TODO TOPServer\n"
-  "**** TODO Review Preliminary Sequences\n"
-  "*** PLC [/]\n"
-  "*** HMI [/]\n"
-  "*** Commissioning [/]\n"
-  "*** After Startup \n"
-  "**** TODO Markup Preliminary Sequences\n")
-
-(define-skeleton skel-person-properties
-  "Insert the org title and filetags for a person."
-  ""
-  "* @"
-  _ - \n
-  ":properties:\n"
-  ":email:\n"
-  ":office:\n"
-  ":cell:\n"
-  ":end:\n")
-
-(define-skeleton skel-workorder-properties
-  "Insert the org title and filetags for a workorder"
-  ""
-  "* TODO Workorder "
-  _ - ":#:customer:city:state:topics:\n")
-
-(provide 're-org-skeletons)
-;;; re-org-skeletons.el ends here

diff --git a/re/re-packages.el b/re/re-packages.el
index 285cfe2dc11a72964df6faac88bf4e3efbfaf66d..aac3371fed42a559574ce91098cc0296c1217903 100644 (file)
--- a/re/re-packages.el
+++ b/re/re-packages.el
@@ -101,7 +101,6 @@
   :config
   (require 're-org)
   (require 're-org-defuns)
-  (require 're-org-skeletons)
   :bind
   (("C-c l" . org-store-link)
    ("C-c a" . org-agenda)

diff --git a/re/re-skeletons.el b/re/re-skeletons.el
new file mode 100644 (file)
index 0000000..11484cd
--- /dev/null
+++ b/re/re-skeletons.el
@@ -0,0 +1,64 @@
+;;; re-skeletons.el -*- lexical-binding: t; -*-
+;; This file is not part of GNU Emacs
+
+;;; Code:
+(define-skeleton skel-org-block
+  "Insert an org source code block"
+  ""
+  "#+begin_src "
+  _ - "\n\n"
+  "#+end_src\n")
+
+(define-skeleton skel-org-block-elisp
+  "Insert an org emacs lisp block"
+  ""
+  "#+begin_src emacs-lisp\n"
+  _ - \n
+  "#+end_src\n")
+
+(define-skeleton skel-facility-properties
+  "Insert the structure for a new facility."
+  ""
+  "** "
+  _ - \n
+  "[[file:c:/projects/JOB]\n[Project Folder]]\n"
+  "[[file:t:/Job_Software/JOB]\n[T Drive]]\n"
+  "[[file:w:/_JOB]\n[Drawing Folder]]\n"
+  "*** System Notes\n"
+  "[[file:w:/_JOB/SEQUENCE OF OPERATIONS][Sequence of Operations]]\n"
+  "*** Before Startup\n"
+  "**** TODO Get Licenses      :licenses:\n"
+  "***** TODO Wonderware\n"
+  "***** TODO TOPServer\n"
+  "**** TODO Review Preliminary Sequences\n"
+  "*** PLC [/]\n"
+  "*** HMI [/]\n"
+  "*** Commissioning [/]\n"
+  "*** After Startup \n"
+  "**** TODO Markup Preliminary Sequences\n")
+
+(define-skeleton skel-person-properties
+  "Insert the org title and filetags for a person."
+  ""
+  "* @"
+  _ - \n
+  ":properties:\n"
+  ":email:\n"
+  ":office:\n"
+  ":cell:\n"
+  ":end:\n")
+
+(define-skeleton skel-workorder-properties
+  "Insert the org title and filetags for a workorder"
+  ""
+  "* TODO Workorder "
+  _ - ":#:customer:city:state:topics:\n")
+
+(define-skeleton workorder-link
+  "part of a link to a workorder, just enter the number."
+  ""
+  "https://eservice.r717.net/index.php/PLC_workorders/store/"
+  _ -)
+
+(provide 're-skeletons)
+;;; re-skeletons.el ends here