[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 90f5299 14/26: Prefix internal symbols with "darkroom--"
From: |
João Távora |
Subject: |
[elpa] master 90f5299 14/26: Prefix internal symbols with "darkroom--" |
Date: |
Fri, 19 Dec 2014 19:07:28 +0000 |
branch: master
commit 90f5299a6927ba39eb8900619f7a1a2925460e8d
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Prefix internal symbols with "darkroom--"
* darkroom.el (darkroom--compute-margins)
(darkroom--float-to-columns, darkroom-buffer-margins)
(darkroom--set-margins, darkroom--saved-mode-line-format)
(darkroom--saved-header-line-format, darkroom--saved-margins)
(darkroom-tentative-mode): Internal variables and functions now
prefixed "darkroom--".
---
darkroom.el | 76 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/darkroom.el b/darkroom.el
index 510fbc4..7d707f7 100644
--- a/darkroom.el
+++ b/darkroom.el
@@ -65,7 +65,7 @@ Its value can be:
like the previous option.
Value is effective when `darkroom-mode' is toggled, when
-changing window or by calling `darkroom-set-margins'"
+changing window or by calling `darkroom--set-margins'"
:type 'float
:group 'darkroom)
@@ -135,7 +135,7 @@ margins should center it on the window, otherwise, margins
of
(t
0.15)))))
-(defun darkroom-compute-margins ()
+(defun darkroom--compute-margins ()
(let ((darkroom-margins
(if (functionp darkroom-margins)
(funcall darkroom-margins)
@@ -144,28 +144,28 @@ margins should center it on the window, otherwise,
margins of
darkroom-margins)
((and (floatp darkroom-margins)
(< darkroom-margins 1))
- (let ((delta (darkroom-float-to-columns darkroom-margins)))
+ (let ((delta (darkroom--float-to-columns darkroom-margins)))
(cons delta delta)))
(t
(error "Illegal value in `darkroom-margins'")))))
-(defun darkroom-float-to-columns (f)
+(defun darkroom--float-to-columns (f)
(ceiling (* (let ((edges (window-edges)))
(- (nth 2 edges) (nth 0 edges)))
f)))
-(defvar darkroom-buffer-margins nil
+(defvar darkroom--buffer-margins nil
"Buffer-local version of `darkroom-margins' defcustom.
-Set by `darkroom-set-margins'")
+Set by `darkroom--set-margins'")
-(defun darkroom-set-margins (&optional margins)
- "Set margins from MARGINS or `darkroom-buffer-margins'."
+(defun darkroom--set-margins (&optional margins)
+ "Set margins from MARGINS or `darkroom--buffer-margins'."
(let* ((window-configuration-change-hook nil))
(when margins
(when (null (car margins)) (setcar margins 0))
(when (null (cdr margins)) (setcdr margins 0)))
- (set (make-local-variable 'darkroom-buffer-margins)
- (or margins darkroom-buffer-margins))
+ (set (make-local-variable 'darkroom--buffer-margins)
+ (or margins darkroom--buffer-margins))
(walk-windows #'(lambda (w)
(when (eq (window-buffer w) (current-buffer))
(setq fringes-outside-margins
@@ -174,23 +174,23 @@ Set by `darkroom-set-margins'")
;; `fringes-outside-margins' for the reason
;; for this apparent noop
(set-window-buffer w (current-buffer))
- (set-window-margins w (car darkroom-buffer-margins)
- (cdr darkroom-buffer-margins))))
+ (set-window-margins w (car darkroom--buffer-margins)
+ (cdr darkroom--buffer-margins))))
nil
'all-frames)))
(defun darkroom-increase-margins (increment)
"Increase darkroom margins by INCREMENT."
(interactive (list darkroom-margin-increment))
- (unless (and (consp darkroom-buffer-margins)
- (numberp (car darkroom-buffer-margins))
- (numberp (cdr darkroom-buffer-margins)))
- (error "`darkroom-buffer-margins' corrupted. Must be a cons of numbers."))
- (setcar darkroom-buffer-margins
- (round (* (+ 1 increment) (car darkroom-buffer-margins))))
- (setcdr darkroom-buffer-margins
- (round (* (+ 1 increment) (cdr darkroom-buffer-margins))))
- (darkroom-set-margins darkroom-buffer-margins))
+ (unless (and (consp darkroom--buffer-margins)
+ (numberp (car darkroom--buffer-margins))
+ (numberp (cdr darkroom--buffer-margins)))
+ (error "`darkroom--buffer-margins' corrupted. Must be a cons of numbers."))
+ (setcar darkroom--buffer-margins
+ (round (* (+ 1 increment) (car darkroom--buffer-margins))))
+ (setcdr darkroom--buffer-margins
+ (round (* (+ 1 increment) (cdr darkroom--buffer-margins))))
+ (darkroom--set-margins darkroom--buffer-margins))
(defun darkroom-decrease-margins (decrement)
"Decrease darkroom margins by DECREMENT."
@@ -203,9 +203,9 @@ Set by `darkroom-set-margins'")
(define-key map (kbd "C-M--") 'darkroom-decrease-margins)
map))
-(defvar darkroom-saved-mode-line-format nil)
-(defvar darkroom-saved-header-line-format nil)
-(defvar darkroom-saved-margins nil)
+(defvar darkroom--saved-mode-line-format nil)
+(defvar darkroom--saved-header-line-format nil)
+(defvar darkroom--saved-margins nil)
(define-minor-mode darkroom-mode
"Remove visual distractions and focus on writing. When this
@@ -214,27 +214,27 @@ view. The buffer margins are set so that text is centered
on
screen. Text size is increased (display engine allowing) by
`darkroom-text-scale-increase'." nil nil nil
(cond (darkroom-mode
- (set (make-local-variable 'darkroom-saved-margins) (window-margins))
- (set (make-local-variable 'darkroom-saved-mode-line-format)
+ (set (make-local-variable 'darkroom--saved-margins) (window-margins))
+ (set (make-local-variable 'darkroom--saved-mode-line-format)
mode-line-format)
- (set (make-local-variable 'darkroom-saved-header-line-format)
+ (set (make-local-variable 'darkroom--saved-header-line-format)
header-line-format)
(setq mode-line-format nil)
(setq header-line-format nil)
(text-scale-increase darkroom-text-scale-increase)
- (darkroom-set-margins (darkroom-compute-margins))
- (add-hook 'window-configuration-change-hook 'darkroom-set-margins
+ (darkroom--set-margins (darkroom--compute-margins))
+ (add-hook 'window-configuration-change-hook 'darkroom--set-margins
nil t))
(t
- (setq mode-line-format darkroom-saved-mode-line-format
- header-line-format darkroom-saved-header-line-format)
+ (setq mode-line-format darkroom--saved-mode-line-format
+ header-line-format darkroom--saved-header-line-format)
(text-scale-decrease darkroom-text-scale-increase)
- (let (darkroom-buffer-margins)
- (darkroom-set-margins darkroom-saved-margins))
- (remove-hook 'window-configuration-change-hook 'darkroom-set-margins
+ (let (darkroom--buffer-margins)
+ (darkroom--set-margins darkroom--saved-margins))
+ (remove-hook 'window-configuration-change-hook 'darkroom--set-margins
t))))
-(defun darkroom-maybe-enable ()
+(defun darkroom--maybe-enable ()
(cond ((and (not darkroom-mode) (= (count-windows) 1))
(darkroom-mode 1))
((and darkroom-mode (> (count-windows) 1))
@@ -250,12 +250,12 @@ screen. Text size is increased (display engine allowing)
by
nil "DarkroomT" nil
(cond (darkroom-tentative-mode
(add-hook 'window-configuration-change-hook
- 'darkroom-maybe-enable nil t)
- (darkroom-maybe-enable))
+ 'darkroom--maybe-enable nil t)
+ (darkroom--maybe-enable))
(t
(if darkroom-mode (darkroom-mode -1))
(remove-hook 'window-configuration-change-hook
- 'darkroom-maybe-enable t))))
+ 'darkroom--maybe-enable t))))
- [elpa] master 4dc83ad 05/26: darkroom-mode added, (continued)
- [elpa] master 4dc83ad 05/26: darkroom-mode added, João Távora, 2014/12/19
- [elpa] master c6e0c3a 07/26: Leave darkroom-mode when leaving tentative-mode, João Távora, 2014/12/19
- [elpa] master 744d72a 08/26: Add .gitignore, João Távora, 2014/12/19
- [elpa] master 9cd8dfd 06/26: Now works with multiple windows for same darkroom buffer, João Távora, 2014/12/19
- [elpa] master 786b5a3 10/26: Integrate another comment from Rasmus, João Távora, 2014/12/19
- [elpa] master 6cbfebe 09/26: Integrate some comments from Rasmus, João Távora, 2014/12/19
- [elpa] master b36123e 11/26: Tidy up margin calculation, João Távora, 2014/12/19
- [elpa] master a16a665 01/26: Initial commit, João Távora, 2014/12/19
- [elpa] master 3a1db96 13/26: Add some docstrings, João Távora, 2014/12/19
- [elpa] master a39ab2e 15/26: Minor tweaks, João Távora, 2014/12/19
- [elpa] master 90f5299 14/26: Prefix internal symbols with "darkroom--",
João Távora <=
- [elpa] master 8b0daf6 12/26: Add (still non-functioning) `darkroom-compute-margins', João Távora, 2014/12/19
- [elpa] master 13717fb 17/26: Attempt a clearer design of modes, João Távora, 2014/12/19
- [elpa] master 20d5539 21/26: load cl-lib, João Távora, 2014/12/19
- [elpa] master 4bf9c10 19/26: Fix `darkroom-tentative-mode', João Távora, 2014/12/19
- [elpa] master 1e68955 16/26: Corrections after another review iteration with Rasmus, João Távora, 2014/12/19
- [elpa] master 15e976b 22/26: Merge pull request #1 from syohex/require-cl-lib, João Távora, 2014/12/19
- [elpa] master 9674d79 20/26: Fix automatic margin calculation, João Távora, 2014/12/19
- [elpa] master 2887b5e 18/26: Redesign setting of margins, which now works per-window, João Távora, 2014/12/19
- [elpa] master 96e61a9 26/26: Add packages/darkroom by merging its upstream subtree, João Távora, 2014/12/19
- [elpa] master 5de9a5d 24/26: Fix darkroom-tentative-mode when switching window's buffer, João Távora, 2014/12/19