[elpa] master d7700fb 4/4: [vcard] Move vcard-mode into main vcard file, release version 0.1

[Eric Abrahamsen]

branch: master
commit d7700fb6a657426297a5c6223ebff42db93dde43
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    [vcard] Move vcard-mode into main vcard file, release version 0.1
    
    * packages/vcard/vcard.el: Put the major mode here instead.
---
 packages/vcard/vcard-mode.el | 61 --------------------------------------------
 packages/vcard/vcard.el      | 51 ++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 75 deletions(-)

diff --git a/packages/vcard/vcard-mode.el b/packages/vcard/vcard-mode.el
deleted file mode 100644
index ad6e124..0000000
--- a/packages/vcard/vcard-mode.el
+++ /dev/null
@@ -1,61 +0,0 @@
-;;; vcard-mode.el --- Major mode for viewing vCard files  -*- lexical-binding: 
t; -*-
-
-;; Copyright (C) 2019  Free Software Foundation, Inc.
-
-;; Author: Eric Abrahamsen <address@hidden>
-;; Maintainer: Eric Abrahamsen <address@hidden>
-
-;; 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
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file contains `vcard-mode', for viewing vcard files.
-
-;;; Code:
-
-(require 'vcard)
-
-(defface vcard-property-face
-  '((t :inherit font-lock-function-name-face))
-  "Face for highlighting property names."
-  :group 'vcard)
-
-(defface vcard-parameter-key-face
-  '((t :inherit font-lock-comment-face))
-  "Face for highlighting parameter keys."
-  :group 'vcard)
-
-(defface vcard-parameter-value-face
-  '((t :inherit font-lock-type-face))
-  "Face for highlighting parameter values."
-  :group 'vcard)
-
-(defvar vcard-font-lock-keywords
-  '("BEGIN:VCARD" "END:VCARD"
-    ("^[^ \t;:]+" . 'vcard-property-face)
-    (";\\([^=\n]+\\)=" (1 'vcard-parameter-key-face))
-    ("=\\([^;:\n]+\\)[;:]" (1 'vcard-parameter-value-face))))
-
-;;;###autoload
-(define-derived-mode vcard-mode text-mode "vCard"
-  "Major mode for viewing vCard files."
-  (turn-off-auto-fill)
-  (set (make-local-variable 'paragraph-start) "BEGIN:VCARD")
-  (setq font-lock-defaults '(vcard-font-lock-keywords)))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.[Vv][Cc][Ff]\\'" . vcard-mode))
-
-(provide 'vcard-mode)
-;;; vcard-mode.el ends here
diff --git a/packages/vcard/vcard.el b/packages/vcard/vcard.el
index 2574cd9..69032b6 100644
--- a/packages/vcard/vcard.el
+++ b/packages/vcard/vcard.el
@@ -1,13 +1,12 @@
-;;; vcard.el --- Utilities for working with vCard files  -*- lexical-binding: 
t; -*-
+;;; vcard.el --- Package for handling vCard files  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2020  Free Software Foundation, Inc.
 
-;; Version: 0
-;; Package-Requires: ((emacs "25.1"))
-
 ;; Author: Eric Abrahamsen <address@hidden>
 ;; Maintainer: Eric Abrahamsen <address@hidden>
-;; Keywords: mail, comm
+
+;; Version: 0.1
+;; Package-Requires: ((emacs "27.1"))
 
 ;; 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
@@ -24,18 +23,42 @@
 
 ;;; Commentary:
 
-;; This package provides libraries for working with vCard data: files
-;; representing contact information.  At present there are two parts
-;; to it: a major mode for looking at *.vcf files, and a library for
-;; parsing those files into elisp data structures.  The third part,
-;; eventually, will be a library for writing elisp data structures to
-;; *.vcf files.
+;; This file contains `vcard-mode', for viewing vCard files.  Other
+;; files in this package contain functions for parsing and writing
+;; vCard data.
 
 ;;; Code:
 
-(defgroup vcard nil
-  "Customization options for the vcard library."
-  :group 'mail)
+(defface vcard-property-face
+  '((t :inherit font-lock-function-name-face))
+  "Face for highlighting property names."
+  :group 'vcard)
+
+(defface vcard-parameter-key-face
+  '((t :inherit font-lock-comment-face))
+  "Face for highlighting parameter keys."
+  :group 'vcard)
+
+(defface vcard-parameter-value-face
+  '((t :inherit font-lock-type-face))
+  "Face for highlighting parameter values."
+  :group 'vcard)
+
+(defvar vcard-font-lock-keywords
+  '("BEGIN:VCARD" "END:VCARD"
+    ("^[^ \t;:]+" . 'vcard-property-face)
+    (";\\([^=\n]+\\)=" (1 'vcard-parameter-key-face))
+    ("=\\([^;:\n]+\\)[;:]" (1 'vcard-parameter-value-face))))
+
+;;;###autoload
+(define-derived-mode vcard-mode text-mode "vCard"
+  "Major mode for viewing vCard files."
+  (turn-off-auto-fill)
+  (set (make-local-variable 'paragraph-start) "BEGIN:VCARD")
+  (setq font-lock-defaults '(vcard-font-lock-keywords)))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.[Vv][Cc][Ff]\\'" . vcard-mode))
 
 (provide 'vcard)
 ;;; vcard.el ends here