From da663aa5dadd1e17dda916b65eb8fbcd9f5bb549 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 28 Feb 2017 18:04:02 -0500 Subject: [PATCH] feature/file-templates: remove f.el references --- core/core-lib.el | 12 ------------ .../feature/file-templates/templates/c++-mode/__hpp | 2 +- modules/feature/file-templates/templates/c-mode/__h | 2 +- .../file-templates/templates/emacs-ert-mode/__ | 2 +- .../templates/emacs-lisp-mode/__initfile | 6 +++--- modules/feature/file-templates/templates/org-mode/__ | 2 +- .../feature/file-templates/templates/rspec-mode/__ | 2 +- .../file-templates/templates/ruby-mode/__module | 8 ++++---- modules/feature/file-templates/templates/sh-mode/__ | 2 +- 9 files changed, 13 insertions(+), 25 deletions(-) diff --git a/core/core-lib.el b/core/core-lib.el index 2f3699020..6d7268690 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -25,18 +25,6 @@ s-lower-camel-case s-upper-camel-case s-snake-case s-dashed-words s-capitalized-words s-titleized-words s-word-initials)) -(mapc (lambda (sym) (autoload sym "f")) - '(f-join f-split f-expand f-filename f-dirname f-common-parent f-ext - f-no-ext f-swap-ext f-base f-relative f-short f-long f-canonical f-slash - f-full f-uniquify f-uniquify-alist f-read-bytes f-write-bytes - f-read-text f-write-text f-append-text f-append-bytes f-mkdir f-delete - f-symlink f-move f-copy f-copy-contenst f-touch f-exists? f-directory? - f-file? f-symlink? f-readable? f-writable? f-executable? f-absolute? - f-relative? f-root? f-ext? f-same? f-parent-of? f-child-of? - f-ancestor-of? f-descendant-of? f-hidden? f-size f-depth f-this-file - f-path-separator f-glob f-entries f-directories f-files f-root - f-traverse-upwards f-with-sandbox)) - ;; ;; Library diff --git a/modules/feature/file-templates/templates/c++-mode/__hpp b/modules/feature/file-templates/templates/c++-mode/__hpp index b58beb13a..c38ae152c 100644 --- a/modules/feature/file-templates/templates/c++-mode/__hpp +++ b/modules/feature/file-templates/templates/c++-mode/__hpp @@ -2,7 +2,7 @@ # group: file templates # contributor: Henrik Lissner # -- -#ifndef ${1:__`(upcase (f-base buffer-file-name))`_H_$(upcase yas-text)} +#ifndef ${1:__`(upcase (file-name-base buffer-file-name))`_H_$(upcase yas-text)} #define $1 $0 diff --git a/modules/feature/file-templates/templates/c-mode/__h b/modules/feature/file-templates/templates/c-mode/__h index b58beb13a..c38ae152c 100644 --- a/modules/feature/file-templates/templates/c-mode/__h +++ b/modules/feature/file-templates/templates/c-mode/__h @@ -2,7 +2,7 @@ # group: file templates # contributor: Henrik Lissner # -- -#ifndef ${1:__`(upcase (f-base buffer-file-name))`_H_$(upcase yas-text)} +#ifndef ${1:__`(upcase (file-name-base buffer-file-name))`_H_$(upcase yas-text)} #define $1 $0 diff --git a/modules/feature/file-templates/templates/emacs-ert-mode/__ b/modules/feature/file-templates/templates/emacs-ert-mode/__ index 595cfef66..425b713b5 100644 --- a/modules/feature/file-templates/templates/emacs-ert-mode/__ +++ b/modules/feature/file-templates/templates/emacs-ert-mode/__ @@ -1,3 +1,3 @@ -;;; `(f-filename buffer-file-name)` +;;; `(file-name-nondirectory buffer-file-name)` $0 \ No newline at end of file diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__initfile b/modules/feature/file-templates/templates/emacs-lisp-mode/__initfile index 63a31a657..c001272ae 100644 --- a/modules/feature/file-templates/templates/emacs-lisp-mode/__initfile +++ b/modules/feature/file-templates/templates/emacs-lisp-mode/__initfile @@ -1,6 +1,6 @@ -;;; `(f-filename buffer-file-name)`${1: --- ${2:description}} +;;; `(file-name-nondirectory buffer-file-name)`${1: --- ${2:description}} $0 -(provide '`(f-base buffer-file-name)`) -;;; `(f-filename buffer-file-name)` ends here +(provide '`(file-name-base buffer-file-name)`) +;;; `(file-name-nondirectory buffer-file-name)` ends here diff --git a/modules/feature/file-templates/templates/org-mode/__ b/modules/feature/file-templates/templates/org-mode/__ index c0f70fd52..67d8e4192 100644 --- a/modules/feature/file-templates/templates/org-mode/__ +++ b/modules/feature/file-templates/templates/org-mode/__ @@ -1,6 +1,6 @@ # -*- mode: snippet -*- # name: Org template # -- -#+TITLE:${1:`(f-base buffer-file-name)`} +#+TITLE:${1:`(file-name-base buffer-file-name)`} $0 \ No newline at end of file diff --git a/modules/feature/file-templates/templates/rspec-mode/__ b/modules/feature/file-templates/templates/rspec-mode/__ index 380e17b57..923dd6d16 100755 --- a/modules/feature/file-templates/templates/rspec-mode/__ +++ b/modules/feature/file-templates/templates/rspec-mode/__ @@ -1,3 +1,3 @@ -# `(f-filename buffer-file-name)` +# `(file-name-nondirectory buffer-file-name)` $0 \ No newline at end of file diff --git a/modules/feature/file-templates/templates/ruby-mode/__module b/modules/feature/file-templates/templates/ruby-mode/__module index 31f49f1ab..66aa75de5 100644 --- a/modules/feature/file-templates/templates/ruby-mode/__module +++ b/modules/feature/file-templates/templates/ruby-mode/__module @@ -1,12 +1,12 @@ # `(progn - (setq-local pkgs (s-split "/" (s-chop-prefix (concat (my/project-root) "lib/") (f-no-ext buffer-file-name)) t)) + (setq-local pkgs (s-split "/" (s-chop-prefix (concat (doom-project-root) "lib/") (file-name-sans-extension buffer-file-name)) t)) (setq-local pkgs-p (eq (length pkgs) 1)) - (setq-local pkg-module (s-replace " " "::" (s-titleized-words (if pkgs-p (-first-item pkgs) (s-join " " (-butlast pkgs)))))) + (setq-local pkg-module (s-replace " " "::" (s-titleized-words (if pkgs-p (car pkgs) (s-join " " (butlast pkgs)))))) - (concat "lib/" (f-filename buffer-file-name)))` + (concat "lib/" (file-name-nondirectory buffer-file-name)))` module `pkg-module` -`(when pkgs-p " VERSION='0.0.1'\n\n")``(concat " class " (if pkgs-p "<< self" (s-capitalize (-last-item pkgs))))` +`(when pkgs-p " VERSION='0.0.1'\n\n")``(concat " class " (if pkgs-p "<< self" (s-capitalize (car (last pkgs)))))` `%`${0:# Code here} end end \ No newline at end of file diff --git a/modules/feature/file-templates/templates/sh-mode/__ b/modules/feature/file-templates/templates/sh-mode/__ index b6a0f8902..3bb86a69c 100644 --- a/modules/feature/file-templates/templates/sh-mode/__ +++ b/modules/feature/file-templates/templates/sh-mode/__ @@ -1,3 +1,3 @@ -#!/usr/bin/env `(if (f-ext? buffer-file-name "zsh") "zsh" "sh")` +#!/usr/bin/env `(if (equal (file-name-extension buffer-file-name) "zsh") "zsh" "bash")` $0