New fortification is working.

Code pruned.
This commit is contained in:
Craig Earls 2014-09-08 20:36:11 -07:00
parent 57e2ec55eb
commit ad87ab16e4
3 changed files with 24 additions and 88 deletions

View file

@ -35,33 +35,33 @@
:type 'boolean :type 'boolean
:group 'ledger-fontification) :group 'ledger-fontification)
(defun ledger-fontify-whole-buffer () ;; (defun ledger-fontify-whole-buffer ()
(interactive) ;; (interactive)
(save-excursion ;; (save-excursion
(message "Ledger fontify whole buffer") ;; (message "Ledger fontify whole buffer")
(goto-char (point-min)) ;; (goto-char (point-min))
(while (not (eobp)) ;; (while (not (eobp))
(cond ((looking-at ledger-xact-start-regex) ;; (cond ((looking-at ledger-xact-start-regex)
(ledger-fontify-xact-at (point))) ;; (ledger-fontify-xact-at (point)))
((looking-at ledger-directive-start-regex) ;; ((looking-at ledger-directive-start-regex)
(ledger-fontify-directive-at (point)))) ;; (ledger-fontify-directive-at (point))))
(ledger-xact-next-xact-or-directive) ;; gets to beginning of next xact ;; (ledger-xact-next-xact-or-directive) ;; gets to beginning of next xact
))) ;; )))
(defun ledger-fontify-activate () ;; (defun ledger-fontify-activate ()
"add hook to fontify after buffer changes" ;; "add hook to fontify after buffer changes"
(interactive) ;; (interactive)
(if (string= (format-mode-line 'mode-name) "Ledger") ;; (if (string= (format-mode-line 'mode-name) "Ledger")
(progn ;; (progn
(ledger-fontify-whole-buffer) ;; (ledger-fontify-whole-buffer)
(add-hook 'after-change-functions 'ledger-fontify-buffer-part) ;; (add-hook 'after-change-functions 'ledger-fontify-buffer-part)
(add-hook 'before-change-functions 'ledger-fontify-ensure-activation) ;; (add-hook 'before-change-functions 'ledger-fontify-ensure-activation)
(message "ledger-fontify-activate called")))) ;; (message "ledger-fontify-activate called"))))
(defun ledger-fontify-ensure-activation (beg end) ;; (defun ledger-fontify-ensure-activation (beg end)
(if (string= (format-mode-line 'mode-name) "Ledger") ;; (if (string= (format-mode-line 'mode-name) "Ledger")
(add-hook 'after-change-functions 'ledger-fontify-buffer-part))) ;; (add-hook 'after-change-functions 'ledger-fontify-buffer-part)))
(defun ledger-fontify-buffer-part (beg end len) (defun ledger-fontify-buffer-part (beg end len)
(save-excursion (save-excursion

View file

@ -227,31 +227,6 @@
"Default face for pending (!) transactions in the reconcile window" "Default face for pending (!) transactions in the reconcile window"
:group 'ledger-faces) :group 'ledger-faces)
;; (defvar ledger-font-lock-keywords
;; `( ;; (,ledger-other-entries-regex 1
;; ;; ledger-font-other-face)
;; (,ledger-comment-regex 0
;; 'ledger-font-comment-face)
;; (,ledger-amount-regex 0
;; 'ledger-font-posting-amount-face)
;; (,ledger-multiline-comment-regex 0 'ledger-font-comment-face)
;; (,ledger-payee-pending-regex 2
;; 'ledger-font-payee-pending-face) ; Works
;; (,ledger-payee-cleared-regex 2
;; 'ledger-font-payee-cleared-face) ; Works
;; (,ledger-payee-uncleared-regex 2
;; 'ledger-font-payee-uncleared-face) ; Works
;; (,ledger-account-cleared-regex 2
;; 'ledger-font-posting-account-cleared-face) ; Works
;; (,ledger-account-pending-regex 2
;; 'ledger-font-posting-account-pending-face) ; Works
;; (,ledger-account-any-status-regex 2
;; 'ledger-font-posting-account-face) ; Works
;; (,ledger-other-entries-regex 1
;; 'ledger-font-other-face))
;; "Expressions to highlight in Ledger mode.")
(defvar ledger-font-lock-keywords (defvar ledger-font-lock-keywords
`(("account" . ledger-font-account-directive-face) `(("account" . ledger-font-account-directive-face)
("apply" . ledger-font-apply-directive-face) ("apply" . ledger-font-apply-directive-face)

View file

@ -307,56 +307,17 @@ With a prefix argument, remove the effective date. "
["Kill Report" ledger-report-kill ledger-works])) ["Kill Report" ledger-report-kill ledger-works]))
;;;###autoload ;;;###autoload
;; (define-derived-mode ledger-mode text-mode "Ledger"
;; "A mode for editing ledger data files."
;; (ledger-check-version)
;; (ledger-schedule-check-available)
;; ;;(ledger-post-setup)
;; (setq-local pcomplete-parse-arguments-function 'ledger-parse-arguments)
;; (setq-local pcomplete-command-completion-function 'ledger-complete-at-point)
;; (add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t)
;; (add-hook 'after-save-hook 'ledger-report-redo)
;; (add-hook 'post-command-hook 'ledger-highlight-xact-under-point nil t)
;; (add-hook 'before-revert-hook 'ledger-occur-remove-all-overlays nil t)
;; (ledger-init-load-init-file)
;; ;; (setq font-lock-defaults
;; ;; `(,ledger-font-lock-keywords t nil nil nil
;; ;; (font-lock-fontify-buffer-function . ledger-fontify-whole-buffer)
;; ;; (font-lock-fontify-region-function . ledger-fontify-buffer-part)))
;; ;; (setq-local font-lock-defaults `(,ledger-font-lock-keywords nil t nil nil
;; ;; (font-lock-fontify-buffer-function . ledger-fontify-whole-buffer)))
;; (setq-local indent-region-function 'ledger-post-align-postings))
(define-derived-mode ledger-mode text-mode "Ledger" (define-derived-mode ledger-mode text-mode "Ledger"
"A mode for editing ledger data files." "A mode for editing ledger data files."
(ledger-check-version) (ledger-check-version)
(ledger-schedule-check-available) (ledger-schedule-check-available)
;;(ledger-post-setup)
;; (set-syntax-table ledger-mode-syntax-table)
;; (set (make-local-variable 'comment-start) "; ")
;; (set (make-local-variable 'comment-end) "")
;; (set (make-local-variable 'indent-tabs-mode) nil)
(if (boundp 'font-lock-defaults) (if (boundp 'font-lock-defaults)
(setq-local font-lock-defaults (setq-local font-lock-defaults
'(ledger-font-lock-keywords t t nil nil '(ledger-font-lock-keywords t t nil nil
(font-lock-fontify-region-function . ledger-fontify-buffer-part)))) (font-lock-fontify-region-function . ledger-fontify-buffer-part))))
;; (setq font-lock-extend-region-functions
;; (list #'font-lock-extend-region-wholelines))
;; (setq font-lock-multiline nil)
;(jit-lock-register 'ledger-fontify-buffer-part)
;(jit-lock-unregister 'font-lock-fontify-region)
(setq-local pcomplete-parse-arguments-function 'ledger-parse-arguments) (setq-local pcomplete-parse-arguments-function 'ledger-parse-arguments)
(setq-local pcomplete-command-completion-function 'ledger-complete-at-point) (setq-local pcomplete-command-completion-function 'ledger-complete-at-point)
(add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t) (add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t)