Merge pull request #37 from purcell/master

Couple of small fixes
This commit is contained in:
Greg Sexton 2018-01-01 15:53:28 +00:00 committed by GitHub
commit 1f38085c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@
;; Version: 1.0 ;; Version: 1.0
;; Keywords: folding ;; Keywords: folding
;; URL: https://github.com/gregsexton/origami.el ;; URL: https://github.com/gregsexton/origami.el
;; Package-Requires: ((s "1.9.0") (dash "2.5.0") (emacs "24")) ;; Package-Requires: ((s "1.9.0") (dash "2.5.0") (emacs "24") (cl-lib "0.5"))
;; The MIT License (MIT) ;; The MIT License (MIT)
@ -34,11 +34,16 @@
(require 'dash) (require 'dash)
(require 's) (require 's)
(require 'cl) (require 'cl-lib)
(require 'origami-parsers) (require 'origami-parsers)
;;; fold display mode and faces ;;; fold display mode and faces
(defgroup origami nil
"Flexible text folding"
:prefix "origami-"
:group 'convenience)
(defcustom origami-fold-replacement "..." (defcustom origami-fold-replacement "..."
;; TODO: this should also be specifiable as a function: folded text -> string ;; TODO: this should also be specifiable as a function: folded text -> string
"Show this string instead of the folded text." "Show this string instead of the folded text."
@ -63,11 +68,6 @@
'((t :inherit 'font-lock-comment-face)) '((t :inherit 'font-lock-comment-face))
"Face used to display the fold replacement text.") "Face used to display the fold replacement text.")
(defgroup origami '((origami-fold-header-face custom-face)
(origami-fold-fringe-face custom-face)
(origami-fold-replacement-face custom-face))
"Origami: A text folding minor mode for Emacs.")
;;; overlay manipulation ;;; overlay manipulation
(defun origami-header-overlay-range (fold-overlay) (defun origami-header-overlay-range (fold-overlay)