From: Michael Heerdegen Date: Mon, 9 Nov 2015 03:17:53 +0000 (+0100) Subject: on-screen: merge from remote repo X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/d08c167d41137fda9627306d8d1b793a6683c0c1 on-screen: merge from remote repo --- diff --git a/packages/on-screen/.gitignore b/packages/on-screen/.gitignore new file mode 100644 index 000000000..c531d9867 --- /dev/null +++ b/packages/on-screen/.gitignore @@ -0,0 +1 @@ +*.elc diff --git a/packages/on-screen/on-screen.el b/packages/on-screen/on-screen.el index 0423d4bc1..e9584e533 100644 --- a/packages/on-screen/on-screen.el +++ b/packages/on-screen/on-screen.el @@ -1,12 +1,14 @@ ;;; on-screen.el --- guide your eyes while scrolling -*- lexical-binding: t -*- -;; Copyright (C) 2015 Free Software Foundation, Inc +;; Copyright (C) 2013 - 2015 Michael Heerdegen +;; 2015 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen ;; Created: 24 Jan 2013 ;; Keywords: convenience -;; Version: 1.3.1 +;; Homepage: https://github.com/michael-heerdegen/on-screen.el +;; Version: 1.3.2 ;; Package-Requires: ((cl-lib "0")) @@ -131,7 +133,7 @@ "What area to highlight. When nil, highlight the previously visible screenful. Else highlight the previously off-screen parts." - :group 'on-screen :type 'boolean) + :type 'boolean) (defcustom on-screen-highlight-method 'fringe "Type of highlighting used by `on-screen-mode'. @@ -155,8 +157,7 @@ dynamically to support different background colors (color themes) (const :tag "Fringe markers" fringe) (const :tag "Transparent overlay" shadow) (const :tag "Overlay on confining text lines" line) - (const :tag "Narrow horizontal line" narrow-line)) - :group 'on-screen) + (const :tag "Narrow horizontal line" narrow-line))) (defcustom on-screen-fringe-marker-position t "Where to display fringe markers. @@ -164,8 +165,7 @@ Ignored if highlighting doesn't use the fringe." :type '(choice (const :tag "Left fringe only" left) (const :tag "Right fringe only" right) - (const :tag "Both sides" t)) - :group 'on-screen) + (const :tag "Both sides" t))) (defface on-screen-shadow '((((class color) (min-colors 88) (background light)) @@ -177,14 +177,12 @@ Ignored if highlighting doesn't use the fringe." :background "green") (((class color) (min-colors 8) (background dark)) :background "blue")) - "Face used for displaying a transparent overlay." - :group 'on-screen) + "Face used for displaying a transparent overlay.") (defface on-screen-hl-line '((((background light)) :background "#ffa0a0") (((background dark)) :background "#300000")) - "Face used for displaying the \"line\" style overlay." - :group 'on-screen) + "Face used for displaying the \"line\" style overlay.") (defcustom on-screen-highlighting-to-background-delta .05 "How much shadow and line highlighting should differ from background. @@ -195,23 +193,20 @@ just face `on-screen-shadow'. This variable is ignored if the library \"hexrgb\" is not available." - :group 'on-screen :type '(choice (const :tag "Use standard face" nil) (float :tag "Delta"))) (defface on-screen-fringe '((t (:inherit shadow))) - "Face used for fringe markers." - :group 'on-screen) + "Face used for fringe markers.") (defface on-screen-narrow-line '((((background dark)) (:width extra-expanded :underline (:color "gray30" :style wave))) (((background light)) (:width extra-expanded :underline (:color "gray70" :style wave)))) - "Face used by the narrow-line highlighting method." - :group 'on-screen) + "Face used by the narrow-line highlighting method.") (defcustom on-screen-delay 5 "How long `on-screen-mode' should display optical aids." - :group 'on-screen :type 'number) + :type 'number) (defcustom on-screen-auto-update t "Whether to update highlighting for successive scrolls. @@ -219,7 +214,7 @@ When non-nil, every scroll action will cause a highlighting according to the previously visible screenful. When nil, a once drawn highlighting will remain fixed relative to the text even if you scroll further until `on-screen-delay' is over." - :group 'on-screen :type 'boolean) + :type 'boolean) (defcustom on-screen-remove-when-edit nil "Whether to instantly remove highlighting when editing. @@ -227,7 +222,7 @@ if you scroll further until `on-screen-delay' is over." In those situations where a single command causes multiple changes to a buffer highlighting is always removed to avoid confusion." - :group 'on-screen :type 'boolean) + :type 'boolean) (defvar on-screen-treat-cut-lines--default-fraction .3) @@ -238,7 +233,6 @@ only partially visible as part of the visible area. Else, a number between 0 and 1, meaning that lines will count as visible when the hidden part of them is less than this number. Note that a non-nil value may make scrolling stuttering on slow computers." - :group 'on-screen :type `(choice (const :tag "Count partially visible lines as visible" nil) (const :tag "Count partially visible lines as not visible" t) (float @@ -247,7 +241,6 @@ a non-nil value may make scrolling stuttering on slow computers." (defcustom on-screen-drawing-threshold 2 "If set, highlight only when scrolled at least that many lines." - :group 'on-screen :type '(choice (const :tag "Off" nil) (integer :value 2)))