diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-11-16 21:41:39 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-11-16 21:41:39 -0500 |
| commit | c2d8d2b2cbfc74ef616ccc6c9f6dea2f8998ffdd (patch) | |
| tree | 3cf172677b6f0469eec18b4f25b3fd2a89f786f1 | |
| parent | af296d7c9e936838f44e8cbbf93a2d0ebc19b45a (diff) | |
| download | orgmode-backport-notes-c2d8d2b2cbfc74ef616ccc6c9f6dea2f8998ffdd.tar.gz | |
org-maint.el: Drop km/ prefix
| -rw-r--r-- | org-maint.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/org-maint.el b/org-maint.el index 0d7e8b6..3e2f782 100644 --- a/org-maint.el +++ b/org-maint.el @@ -1,8 +1,8 @@ -(defvar km/org-maint-emacs-dir "~/src/emacs/emacs/") -(defvar km/org-maint-org-dir "~/src/emacs/org-mode-devel/") +(defvar org-maint-emacs-dir "~/src/emacs/emacs/") +(defvar org-maint-org-dir "~/src/emacs/org-mode-devel/") -(defun km/org-maint-apply-emacs-commit (commit &optional apply) - "Apply COMMIT from `km/org-maint-emacs-dir' to `km/org-maint-org-dir'. +(defun org-maint-apply-emacs-commit (commit &optional apply) + "Apply COMMIT from `org-maint-emacs-dir' to `org-maint-org-dir'. If APPLY is non-nil, use 'git apply' instead of 'git am'." (interactive (list (or (and (use-region-p) (buffer-substring-no-properties @@ -10,24 +10,24 @@ If APPLY is non-nil, use 'git apply' instead of 'git am'." (magit-commit-at-point) (read-string "Emacs commit: ")) current-prefix-arg)) - (unless (and km/org-maint-org-dir km/org-maint-emacs-dir) - (user-error "Need to set km/org-maint-org-dir and km/org-maint-emacs-dir")) + (unless (and org-maint-org-dir org-maint-emacs-dir) + (user-error "Need to set org-maint-org-dir and org-maint-emacs-dir")) (with-temp-buffer - (let ((default-directory km/org-maint-emacs-dir)) + (let ((default-directory org-maint-emacs-dir)) (call-process "git" nil t nil "format-patch" "--stdout" (format "%s^..%s" commit commit) "--" "lisp/org")) - (let ((default-directory km/org-maint-org-dir)) + (let ((default-directory org-maint-org-dir)) (call-process-region (point-min) (point-max) "git" nil t nil (if apply "apply" "am") "-p3" "--directory=lisp/")))) -(defun km/org-maint-insert-emacs-commit-info (commit) - "Insert information about COMMIT in `km/org-maint-emacs-dir'." +(defun org-maint-insert-emacs-commit-info (commit) + "Insert information about COMMIT in `org-maint-emacs-dir'." (interactive "sCommit: ") - (let ((default-directory km/org-maint-emacs-dir)) + (let ((default-directory org-maint-emacs-dir)) (call-process "git" nil t nil "show" "-s" "--format=%b%n%s%n%H%n%an%n%cd" commit))) |