From 01bebe719bc45495ba151e476cdc96512ed2e500 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Mon, 8 Oct 2012 14:41:46 +0200 Subject: [PATCH] =?utf8?q?num3-mode:=20use=20=E2=80=9Cnum3--=E2=80=9D=20as?= =?utf8?q?=20prefix=20for=20private=20symbols?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Previous version of num3-mode used “-num3” as a prefix for private symbols which goes against the style used in the rest of Emacs. This commit changes the prefix to “num3--”. --- packages/num3-mode/num3-mode.el | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/num3-mode/num3-mode.el b/packages/num3-mode/num3-mode.el index b5ce0e591..48f85f4f7 100644 --- a/packages/num3-mode/num3-mode.el +++ b/packages/num3-mode/num3-mode.el @@ -5,7 +5,7 @@ ;; Author: Felix Lee , Michal Nazarewicz ;; Maintainer: Michal Nazarewicz ;; Keywoards: faces, minor-mode -;; Version: 1.0 +;; Version: 1.1 ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -88,31 +88,31 @@ ie. groups are counted starting with one outwards from the (place where) decimal point (would be) is." nil " num3" nil (if num3-mode - (unless (assoc '-num3-matcher font-lock-keywords) - (font-lock-add-keywords nil '(-num3-matcher) 'append)) - (font-lock-remove-keywords nil '(-num3-matcher))) + (unless (assoc 'num3--matcher font-lock-keywords) + (font-lock-add-keywords nil '(num3--matcher) 'append)) + (font-lock-remove-keywords nil '(num3--matcher))) (when font-lock-mode (font-lock-fontify-buffer))) ;;;###autoload (define-globalized-minor-mode global-num3-mode num3-mode num3-mode) -(defconst -num3-number-re +(defconst num3--number-re (concat "\\(?:0[xX]\\|#\\)\\([0-9a-fA-F]+\\)" ; 1 = hexadecimal "\\|\\([0-9]+\\)" ; 2 = decimal "\\|\\.\\([0-9]+\\)")) ; 3 = fraction -(defun -num3-matcher (lim) +(defun num3--matcher (lim) "Function used as a font-lock-keywoard handler used in `num3-mode'. Performs fontification of numbers from point to LIM." (save-excursion - (while (re-search-forward -num3-number-re lim t) - (-num3-int (match-beginning 1) (match-end 1) 4) - (-num3-int (match-beginning 2) (match-end 2) num3-group-size) - (-num3-frac (match-beginning 3) (match-end 3) num3-group-size))) + (while (re-search-forward num3--number-re lim t) + (num3--int (match-beginning 1) (match-end 1) 4) + (num3--int (match-beginning 2) (match-end 2) num3-group-size) + (num3--frac (match-beginning 3) (match-end 3) num3-group-size))) nil) -(defun -num3-int (lo hi n) +(defun num3--int (lo hi n) "Highlight groups of digits in a long number. LO and HI arguments specify the range where the number is located. If the length of that region exceeds `num3-threshold', @@ -122,10 +122,10 @@ faces. Grouping is done from the end, eg. (12)(345)." (when (and lo (>= (- hi lo) num3-threshold)) (let (even) (while (< lo hi) - (-num3-put even (max lo (- hi n)) hi) + (num3--put even (max lo (- hi n)) hi) (setq hi (- hi n) even (not even)))))) -(defun -num3-frac (lo hi n) +(defun num3--frac (lo hi n) "Highlight groups of digits in a long number. LO and HI arguments specify the range where the number is located. If the length of that region exceeds `num3-threshold', @@ -135,10 +135,10 @@ faces. Grouping is done from the beginning, eg. (123)(45)." (when (and lo (>= (- hi lo) num3-threshold)) (let (even) (while (< lo hi) - (-num3-put even lo (min hi (+ lo n))) + (num3--put even lo (min hi (+ lo n))) (setq lo (+ lo n) even (not even)))))) -(defun -num3-put (even lo hi) +(defun num3--put (even lo hi) "Add font lock text property to highlight a single group of digit. Use `num3-face-odd' if EVEN is nil and `num3-face-even' if EVEN is non-nil. The region the face is set to is from LO to HI." -- 2.39.2