More abbrevs

diff --git a/sotlisp.el b/sotlisp.el
index 7dcf762c846f69f5fa8acd19423bad64d3611d44..ec4a6c587738486f8a68ec77b7f030e38334a341 100644 (file)
--- a/sotlisp.el
+++ b/sotlisp.el
@@ -187,27 +187,38 @@ The space char is not included.  Any \"$\" are also removed."
     ("bb" . "bury-buffer")\r
     ("bc" . "forward-char -1")\r
     ("bfn" . "buffer-file-name")\r
-    ("bn" . "buffer-name")\r
     ("bl" . "buffer-list$")\r
+    ("bn" . "buffer-name")\r
     ("bod" . "beginning-of-defun")\r
+    ("bol" . "forward-line 0$")\r
     ("bp" . "boundp '")\r
     ("bs" . "buffer-string$")\r
+    ("bsn" . "buffer-substring-no-properties")\r
     ("bss" . "buffer-substring ")\r
     ("bw" . "forward-word -1")\r
     ("c" . "concat ")\r
     ("ca" . "char-after$")\r
+    ("cb" . "current-buffer$")\r
     ("cc" . "condition-case er\n$\n(error nil)")\r
     ("ci" . "call-interactively ")\r
     ("cip" . "called-interactively-p 'any")\r
     ("csv" . "customize-save-variable '")\r
     ("d" . "delete-char 1")\r
-    ("df" . "delete-file ")\r
-    ("dl" . "dolist (it $)")\r
+    ("dc" . "delete-char 1")\r
+    ("dcu" . "defcustom $ t\n  \"\"\n  :type 'boolean")\r
+    ("df" . "defun $ ()\n  \"\"\n  ")\r
+    ("dfa" . "defface $ \n  '((t))\n  \"\"\n  ")\r
+    ("dfc" . "defcustom $ t\n  \"\"\n  :type 'boolean")\r
+    ("dff" . "defface $ \n  '((t))\n  \"\"\n  ")\r
+    ("dfv" . "defvar $ t\n  \"\"")\r
     ("dk" . "define-key ")\r
+    ("dl" . "dolist (it $)")\r
     ("dmp" . "derived-mode-p '")\r
     ("dr" . "delete-region ")\r
+    ("dv" . "defvar $ t\n  \"\"")\r
     ("e" . "error \"$\"")\r
     ("efn" . "expand-file-name ")\r
+    ("eol" . "end-of-line")\r
     ("f" . "format \"$\"")\r
     ("fb" . "fboundp '")\r
     ("fbp" . "fboundp '")\r
@@ -223,60 +234,89 @@ The space char is not included.  Any \"$\" are also removed."
     ("gsk" . "global-set-key ")\r
     ("i" . "insert ")\r
     ("ie" . "ignore-errors ")\r
+    ("ii" . "interactive")\r
+    ("ir" . "indent-region ")\r
+    ("jcl" . "justify-current-line ")\r
+    ("jl" . "delete-indentation")\r
+    ("jos" . "just-one-space")\r
+    ("jr" . "json-read$")\r
+    ("jtr" . "jump-to-register ")\r
     ("k" . "kbd \"$\"")\r
     ("kb" . "kill-buffer")\r
+    ("kn" . "kill-new ")\r
     ("l" . "lambda ($)")\r
     ("la" . "looking-at \"$\"")\r
     ("lap" . "looking-at-p \"$\"")\r
     ("lb" . "looking-back \"$\"")\r
+    ("lbp" . "line-beginning-position")\r
+    ("lep" . "line-end-position")\r
     ("let" . "let (($))")\r
     ("lp" . "listp ")\r
     ("m" . "message \"$%s\"")\r
     ("mb" . "match-beginning 0")\r
     ("me" . "match-end 0")\r
     ("ms" . "match-string 0")\r
+    ("msn" . "match-string-no-properties 0")\r
     ("msnp" . "match-string-no-properties 0")\r
+    ("msp" . "match-string-no-properties 0")\r
     ("n" . "not ")\r
+    ("nai" . "newline-and-indent$")\r
     ("nl" . "forward-line 1")\r
     ("np" . "numberp ")\r
+    ("ntr" . "narrow-to-region ")\r
     ("ow" . "other-window 1")\r
     ("p" . "point$")\r
     ("pa" . "point-max$")\r
+    ("pg" . "plist-get ")\r
     ("pi" . "point-min$")\r
     ("r" . "require '")\r
+    ("ra" . "use-region-p$")\r
+    ("rap" . "use-region-p$")\r
+    ("rb" . "region-beginning")\r
+    ("re" . "region-end")\r
     ("rh" . "remove-hook '")\r
     ("rm" . "replace-match \"$\"")\r
-    ("rq" . "regexp-quote \"$\"")\r
+    ("ro" . "regexp-opt ")\r
+    ("rq" . "regexp-quote ")\r
     ("rris" . "replace-regexp-in-string ")\r
     ("rrs" . "replace-regexp-in-string ")\r
     ("rs" . "while (search-forward $ nil t)\n(replace-match \"\") nil t)")\r
+    ("rsb" . "re-search-backward $ nil 'noerror")\r
+    ("rsf" . "re-search-forward $ nil 'noerror")\r
     ("s" . "setq ")\r
-    ("s=" . "string= ")\r
-    ("sb" . "search-backward \"$\"")\r
-    ("sbr" . "search-backward-regexp \"$\"")\r
+    ("sb" . "search-backward $ nil 'noerror")\r
+    ("sbr" . "search-backward-regexp $ nil 'noerror")\r
     ("scb" . "skip-chars-backward \"$\r\n[:blank:]\"")\r
     ("scf" . "skip-chars-forward \"$\r\n[:blank:]\"")\r
-    ("se" . "save-excursion")\r
-    ("sf" . "search-forward \"$\"")\r
-    ("sfr" . "search-forward-regexp \"$\"")\r
+    ("se" . "save-excursion\n")\r
+    ("sf" . "search-forward $ nil 'noerror")\r
+    ("sfr" . "search-forward-regexp $ nil 'noerror")\r
+    ("sic" . "self-insert-command")\r
+    ("sl" . "string<")\r
     ("sm" . "string-match \"$\"")\r
-    ("smd" . "save-match-data")\r
+    ("smd" . "save-match-data\n")\r
     ("sn" . "symbol-name ")\r
     ("sp" . "stringp ")\r
-    ("sr" . "save-restriction")\r
+    ("sq" . "string= ")\r
+    ("sr" . "save-restriction\n")\r
     ("ss" . "substring ")\r
+    ("ssn" . "substring-no-properties ")\r
+    ("ssnp" . "substring-no-properties ")\r
     ("stb" . "switch-to-buffer ")\r
-    ("sw" . "select-window ")\r
+    ("sw" . "selected-window$")\r
+    ("syp" . "symbolp ")\r
     ("tap" . "thing-at-point 'symbol")\r
     ("u" . "unless ")\r
-    ("up" . "unwind-protect ")\r
+    ("ul" . "up-list")\r
+    ("up" . "unwind-protect\n(progn $)")\r
+    ("urp" . "use-region-p$")\r
     ("w" . "when ")\r
     ("wcb" . "with-current-buffer ")\r
     ("wf" . "write-file ")\r
     ("wh" . "while ")\r
     ("wl" . "window-list nil 'nominibuffer")\r
-    ("wtb" . "with-temp-buffer")\r
-    ("wtf" . "with-temp-file")\r
+    ("wtb" . "with-temp-buffer\n")\r
+    ("wtf" . "with-temp-file ")\r
     )\r
   "Alist of (ABBREV . EXPANSION) used by `sotlisp'.")\r
 \r