From d0d05e5df122b27148545f2d7c92e2c8345b9c83 Mon Sep 17 00:00:00 2001 From: Bastien Date: Tue, 3 Jan 2017 12:22:38 +0100 Subject: [PATCH] Delete org-bullets.el from the contrib/ directory * lisp/org.el (org-modules): Don't mention org-bullets.el, which is now deleted from the contrib/ directory. See https://github.com/sabof/org-bullets/issues/18 --- contrib/README | 1 - contrib/lisp/org-bullets.el | 122 ------------------------------------ etc/ORG-NEWS | 9 +++ lisp/org.el | 1 - 4 files changed, 9 insertions(+), 124 deletions(-) delete mode 100644 contrib/lisp/org-bullets.el diff --git a/contrib/README b/contrib/README index 48c58b9ff..ae4f96b0e 100644 --- a/contrib/README +++ b/contrib/README @@ -15,7 +15,6 @@ Org utils org-annotate-file.el --- Annotate a file with org syntax org-bibtex-extras.el --- Extras for working with org-bibtex entries org-bookmark.el --- Links to bookmarks -org-bullets.el --- Show bullets in org-mode as UTF-8 characters org-checklist.el --- org functions for checklist handling org-choose.el --- Use TODO keywords to mark decision states org-collector.el --- Collect properties into tables diff --git a/contrib/lisp/org-bullets.el b/contrib/lisp/org-bullets.el deleted file mode 100644 index 2951bf8ac..000000000 --- a/contrib/lisp/org-bullets.el +++ /dev/null @@ -1,122 +0,0 @@ -;;; org-bullets.el --- Show bullets in org-mode as UTF-8 characters -;; Version: 0.2.2 -;; Author: sabof -;; URL: https://github.com/sabof/org-bullets - -;; This file is NOT part of GNU Emacs. -;; -;; 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, 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 ; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Commentary: - -;; The project is hosted at https://github.com/sabof/org-bullets -;; The latest version, and all the relevant information can be found there. - -;;; Code: - -(eval-when-compile (require 'cl)) - -(defgroup org-bullets nil - "Display bullets as UTF-8 characters." - :group 'org-appearance) - -;; A nice collection of unicode bullets: -;; http://nadeausoftware.com/articles/2007/11/latency_friendly_customized_bullets_using_unicode_characters -(defcustom org-bullets-bullet-list - '(;;; Large - "◉" - "○" - "✸" - "✿" - ;; ♥ ● ◇ ✚ ✜ ☯ ◆ ♠ ♣ ♦ ☢ ❀ ◆ ◖ ▶ - ;;; Small - ;; ► • ★ ▸ - ) - "This variable contains the list of bullets. -It can contain any number of one-character strings. -For levels beyond the size of the list, the stars will be -displayed using the first items again." - :group 'org-bullets - :type '(repeat (string :tag "Bullet character"))) - -(defcustom org-bullets-face-name nil - "Allows to override `org-mode' bullets face. -If set to a name of a face, that face will be used. -Otherwise the face of the heading level will be used." - :group 'org-bullets - :type 'symbol) - -(defvar org-bullets-bullet-map - '(keymap - (mouse-1 . org-cycle) - (mouse-2 . (lambda (e) - (interactive "e") - (mouse-set-point e) - (org-cycle)))) - "Mouse events for bullets. -If this is undesirable, one can remove them with - -\(setcdr org-bullets-bullet-map nil\)") - -(defun org-bullets-level-char (level) - "Return a character corresponding to LEVEL." - (string-to-char - (nth (mod (1- level) - (length org-bullets-bullet-list)) - org-bullets-bullet-list))) - -;;;###autoload -(define-minor-mode org-bullets-mode - "UTF-8 bullets for `org-mode'." - nil nil nil - (let* ((keyword - `((,org-outline-regexp-bol - (0 (let (( level (- (match-end 0) (match-beginning 0) 1))) - (compose-region (- (match-end 0) 2) - (- (match-end 0) 1) - (org-bullets-level-char level)) - (when (facep org-bullets-face-name) - (put-text-property (- (match-end 0) 2) - (- (match-end 0) 1) - 'face - org-bullets-face-name)) - (put-text-property (match-beginning 0) - (- (match-end 0) 2) - 'face (list :foreground - (face-attribute - 'default :background))) - (put-text-property (match-beginning 0) - (match-end 0) - 'keymap - org-bullets-bullet-map) - nil)))))) - (if org-bullets-mode - (progn (font-lock-add-keywords nil keyword) - (font-lock-fontify-buffer)) - (save-excursion - (goto-char (point-min)) - (font-lock-remove-keywords nil keyword) - (while (re-search-forward org-outline-regexp-bol nil t) - (decompose-region (match-beginning 0) (match-end 0))) - (font-lock-fontify-buffer))))) - -(provide 'org-bullets) - -;; Local Variables: -;; coding: utf-8-emacs -;; End: - -;;; org-bullets.el ends here diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 6f25a7812..b2c9d7248 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -23,6 +23,15 @@ into : (file (lambda () (sexp))) +*** Deleted contributed packages + +=org-ebib.el= and =org-bullets.el= have been deleted from the contrib/ directory. + +You can now find them here : + +- https://github.com/joostkremers/ebib +- https://github.com/sabof/org-bullets + *** Removal of ~:sitemap-sans-extension~ The publishing property is no longer recognized, as a consequence of diff --git a/lisp/org.el b/lisp/org.el index aed4d371b..a443c453a 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -709,7 +709,6 @@ For export specific modules, see also `org-export-backends'." (const :tag "C annotate-file: Annotate a file with org syntax" org-annotate-file) (const :tag "C bookmark: Org links to bookmarks" org-bookmark) - (const :tag "C bullets: Add overlays to headlines stars" org-bullets) (const :tag "C checklist: Extra functions for checklists in repeated tasks" org-checklist) (const :tag "C choose: Use TODO keywords to mark decisions states" org-choose) (const :tag "C collector: Collect properties into tables" org-collector)