Browse Source

Merge pull request #1 from DamienCassou/0.2.0

Release 0.2.0
tags/v0.2.0^0
Damien Cassou 2 months ago
parent
commit
5ee835a442
No account linked to committer's email address
6 changed files with 39 additions and 18 deletions
  1. +12
    -0
      .drone.yml
  2. +0
    -9
      .gitlab-ci.yml
  3. +12
    -0
      .travis.yml
  4. +3
    -3
      Makefile
  5. +2
    -2
      khardel-org.el
  6. +10
    -4
      khardel.el

+ 12
- 0
.drone.yml View File

@@ -0,0 +1,12 @@
kind: pipeline
name: default
steps:
- name: check
image: ubuntu:latest
commands:
- add-apt-repository ppa:kelleyk/emacs -y
- apt-get update
- apt-get install -y emacs26
- emacs --version
- make ci-dependencies
- make check

+ 0
- 9
.gitlab-ci.yml View File

@@ -1,9 +0,0 @@
image: silex/emacs:26-dev

test:
before_script:
- emacs --version
- make makel-version
- make ci-dependencies
script:
- make check

+ 12
- 0
.travis.yml View File

@@ -0,0 +1,12 @@
language: nix

install:
- bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install)

env:
- EMACS_CI=emacs-26-3

script:
- emacs --version
- make ci-dependencies
- make check

+ 3
- 3
Makefile View File

@@ -1,6 +1,6 @@
ELPA_DEPENDENCIES=yaml-mode package-lint
ELPA_DEPENDENCIES=yaml-mode package-lint let-alist

ELPA_ARCHIVES=melpa
ELPA_ARCHIVES=melpa gnu

LINT_CHECKDOC_FILES=$(wildcard *.el)
LINT_PACKAGE_LINT_FILES=$(wildcard *.el)
@@ -14,7 +14,7 @@ makel.mk:
curl \
--fail --silent --show-error --insecure --location \
--retry 9 --retry-delay 9 \
-O https://gitlab.petton.fr/DamienCassou/makel/raw/v0.5.1/makel.mk; \
-O https://gitlab.petton.fr/DamienCassou/makel/raw/v0.5.3/makel.mk; \
fi

# Include makel.mk if present

+ 2
- 2
khardel-org.el View File

@@ -4,8 +4,8 @@

;; Author: Nicolas Petton <nicolas@petton.fr>
;; Url: https://gitlab.petton.fr/DamienCassou/khardel
;; Package-requires: ((emacs "25.1"))
;; Version: 0.1.0
;; Package-requires: ((emacs "26.1"))
;; Version: 0.2.0

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by

+ 10
- 4
khardel.el View File

@@ -5,7 +5,7 @@
;; Author: Damien Cassou <damien@cassou.me>
;; Url: https://gitlab.petton.fr/DamienCassou/khardel
;; Package-requires: ((emacs "25.1") (yaml-mode "0.0.13"))
;; Version: 0.1.0
;; Version: 0.2.0

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -42,6 +42,11 @@
"Hook run when a contact edition is completed."
:type 'hook)

(defcustom khardel-vcard-version "3.0"
"Version of the vcard format used.
This is passed to \"vcard new\".'"
:type 'string)

(defvar khardel--emails nil
"Cache a list of strings of the form \"Name <email>\".")

@@ -98,7 +103,7 @@ If nil, the buffer represents a new contact.")
(interactive (list (khardel-choose-contact)))
(let ((buffer (generate-new-buffer (format "*khardel<%s>*" (cdr contact)))))
(with-current-buffer buffer
(call-process "khard" nil t nil "export" "--uid" (car contact))
(call-process "khard" nil t nil "show" "--format" "yaml" "--uid" (car contact))
(goto-char (point-min))
(khardel-edit-mode)
(setq-local khardel-edit-contact contact))
@@ -112,7 +117,7 @@ If nil, the buffer represents a new contact.")
(interactive)
(let ((buffer (generate-new-buffer "*khardel<new>*")))
(with-current-buffer buffer
(call-process "khard" nil t nil "export" "--empty-contact-template")
(call-process "khard" nil t nil "template")
(khardel-edit-mode)
(setq-local khardel-edit-contact nil))
(switch-to-buffer buffer)
@@ -137,7 +142,8 @@ If nil, the buffer represents a new contact.")
"--uid" ,(car khardel-edit-contact)
"--input-file" ,filename)
`("new"
"--input-file" ,filename))))
"--input-file" ,filename
"--vcard-version" ,khardel-vcard-version))))
(write-region (point-min) (point-max) filename)
(when (equal 0 (apply
#'call-process-region

Loading…
Cancel
Save