[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d08c167 48/50: on-screen: merge from remote repo
From: |
Michael Heerdegen |
Subject: |
[elpa] master d08c167 48/50: on-screen: merge from remote repo |
Date: |
Mon, 09 Nov 2015 03:35:56 +0000 |
branch: master
commit d08c167d41137fda9627306d8d1b793a6683c0c1
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
on-screen: merge from remote repo
---
packages/on-screen/.gitignore | 1 +
packages/on-screen/on-screen.el | 35 ++++++++++++++---------------------
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/packages/on-screen/.gitignore b/packages/on-screen/.gitignore
new file mode 100644
index 0000000..c531d98
--- /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 0423d4b..e9584e5 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 <address@hidden>
;; Maintainer: Michael Heerdegen <address@hidden>
;; 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)))
- [elpa] master ef81e20 35/50: change default of on-screen-treat-cut-lines back to nil, (continued)
- [elpa] master ef81e20 35/50: change default of on-screen-treat-cut-lines back to nil, Michael Heerdegen, 2015/11/08
- [elpa] master 7012d04 41/50: bump version to 1.3, Michael Heerdegen, 2015/11/08
- [elpa] master c03f4b0 33/50: new user variable: on-screen-inhibit-highlighting, Michael Heerdegen, 2015/11/08
- [elpa] master b51ac73 36/50: use separate face for "line" style highlighting, Michael Heerdegen, 2015/11/08
- [elpa] master 4014e32 38/50: make comments respect conventions, Michael Heerdegen, 2015/11/08
- [elpa] master 49d5546 42/50: fix whitespace, no code change, Michael Heerdegen, 2015/11/08
- [elpa] master 7bb7f0d 46/50: add .gitignore, Michael Heerdegen, 2015/11/08
- [elpa] master 009d1a4 44/50: wrap (require 'cl-lib) in eval-when-compile, Michael Heerdegen, 2015/11/08
- [elpa] master 387cb55 40/50: add on-screen-unload-function, Michael Heerdegen, 2015/11/08
- [elpa] master 1570a0d 49/50: add "on-screen" to externals-list, Michael Heerdegen, 2015/11/08
- [elpa] master d08c167 48/50: on-screen: merge from remote repo,
Michael Heerdegen <=
- [elpa] master 8e3c53d 34/50: bump version to 1.2, Michael Heerdegen, 2015/11/08
- [elpa] master 13bf083 39/50: handle on-screen-treat-cut-lines -> t nicely, Michael Heerdegen, 2015/11/08
- [elpa] master e023bf8 45/50: bump version, Michael Heerdegen, 2015/11/08
- [elpa] master 65bbd8d 50/50: Merge commit 'a66fc082499967627cb89802fc2783accea5cb4b', Michael Heerdegen, 2015/11/08
- [elpa] master a042e0d 28/50: avoid error when user sets on-screen-treat-cut-lines to just t, Michael Heerdegen, 2015/11/08
- [elpa] master dd3930b 43/50: convey copyright to the FSF, Michael Heerdegen, 2015/11/08
- [elpa] master a66fc08 47/50: remove redundant :group specs, Michael Heerdegen, 2015/11/08