gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Start of on-the-fly font-locking.

Browse source
This commit is contained in:
Phil Jackson 2010-09-01 19:32:10 +01:00
parent 02600a8e47
commit 4ab9bab7c5
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
magit-key-mode.el
View file

@ -225,24 +225,6 @@ put it in magit-key-mode-key-maps for fast lookup."
(aput 'magit-key-mode-key-maps for-group map) (aput 'magit-key-mode-key-maps for-group map)
map))) map)))
(defvar magit-key-mode-header-re
(rx line-start (| "Actions" "Switches" "Arguments") ":"))
(defvar magit-key-mode-action-re
(rx line-start
(char space)
(group
(* (char "-="))
(char "*." alpha))
": "
(group
(* not-newline))))
(defvar magit-key-mode-font-lock-keywords
(list
(list magit-key-mode-header-re 0 'font-lock-keyword-face)
(list magit-key-mode-action-re '(1 font-lock-builtin-face))))
(defun magit-key-mode-command (func) (defun magit-key-mode-command (func)
(let ((args '())) (let ((args '()))
;; why can't maphash return a list?! ;; why can't maphash return a list?!
@ -314,8 +296,6 @@ put it in magit-key-mode-key-maps for fast lookup."
(let ((buffer-read-only nil)) (let ((buffer-read-only nil))
(erase-buffer) (erase-buffer)
(make-local-variable 'font-lock-defaults) (make-local-variable 'font-lock-defaults)
(setq font-lock-defaults
'(magit-key-mode-font-lock-keywords t nil nil nil))
(use-local-map (use-local-map
(or (cdr (assoc for-group magit-key-mode-key-maps)) (or (cdr (assoc for-group magit-key-mode-key-maps))
(magit-key-mode-build-keymap for-group))) (magit-key-mode-build-keymap for-group)))
@ -324,6 +304,9 @@ put it in magit-key-mode-key-maps for fast lookup."
(setq buffer-read-only t) (setq buffer-read-only t)
(fit-window-to-buffer)) (fit-window-to-buffer))
(defun magit-key-mode-draw-header (header)
(insert (propertize header 'face 'font-lock-keyword-face)))
(defun magit-key-mode-draw-actions (actions) (defun magit-key-mode-draw-actions (actions)
(when actions (when actions
(let* ((action-strs (mapcar (lambda (a) (let* ((action-strs (mapcar (lambda (a)
@ -331,7 +314,7 @@ put it in magit-key-mode-key-maps for fast lookup."
actions)) actions))
(longest-act (apply 'max (mapcar 'length action-strs))) (longest-act (apply 'max (mapcar 'length action-strs)))
(max-size 70)) (max-size 70))
(insert "Actions:\n") (magit-key-mode-draw-header "Actions\n")
(dolist (str action-strs) (dolist (str action-strs)
(let ((padding (make-string (- (+ longest-act 5) (length str)) ? ))) (let ((padding (make-string (- (+ longest-act 5) (length str)) ? )))
(insert str) (insert str)
@ -348,7 +331,7 @@ put it in magit-key-mode-key-maps for fast lookup."
(actions (cdr (assoc 'actions options)))) (actions (cdr (assoc 'actions options))))
(magit-key-mode-draw-actions actions) (magit-key-mode-draw-actions actions)
(when switches (when switches
(insert "Switches:\n") (magit-key-mode-draw-header "Switches\n")
(dolist (switch switches) (dolist (switch switches)
(let ((option (nth 2 switch))) (let ((option (nth 2 switch)))
(insert (insert
@ -357,10 +340,10 @@ put it in magit-key-mode-key-maps for fast lookup."
(nth 1 switch) (nth 1 switch)
(if (member option magit-key-mode-current-options) (if (member option magit-key-mode-current-options)
(propertize option (propertize option
'font-lock-face 'font-lock-warning-face) 'face 'font-lock-warning-face)
option)))))) option))))))
(when arguments (when arguments
(insert "Arguments:\n") (magit-key-mode-draw-header "Arguments\n")
(dolist (argument arguments) (dolist (argument arguments)
(insert (insert
(format " %s: (%s) %s %s\n" (format " %s: (%s) %s %s\n"