| Revision | 296 (tree) |
|---|---|
| Time | 2012-04-10 00:28:17 |
| Author | mhayashi1120 |
small fix
trunk/MAKE-TARGETS.mk (diff) trunk/fsvn-deps.el (diff) trunk/fsvn-ui.el (diff) trunk/ChangeLog (diff) trunk/fsvn-dev.el (diff) trunk/fsvn-pub.el (diff) trunk/DOC/fsvn-publish.el (diff) trunk/TODO (diff)| @@ -234,7 +234,7 @@ | ||
| 234 | 234 | (setq version (match-string 1 raw-version))) |
| 235 | 235 | (setq fsvn-svn-version (or version raw-version)) |
| 236 | 236 | (when (version<= fsvn-svn-version "1.4") |
| 237 | - (error "Svn command must be 1.4.x or later"))))))) | |
| 237 | + (error "Svn command must be 1.5.x or later"))))))) | |
| 238 | 238 | |
| 239 | 239 | (defun fsvn-build-subcommand (&optional force) |
| 240 | 240 | (mapc |
| @@ -139,6 +139,15 @@ | ||
| 139 | 139 | (defvar fsvn-link-face 'fsvn-link-face |
| 140 | 140 | "Face used for any link.") |
| 141 | 141 | |
| 142 | +(defface fsvn-match-face | |
| 143 | + '((t :inherit match)) | |
| 144 | + "Face used for match searching text." | |
| 145 | + :group 'fsvn-faces | |
| 146 | + :version "22.1") | |
| 147 | + | |
| 148 | +(defvar fsvn-match-face 'fsvn-match-face | |
| 149 | + "Face used for match searching text.") | |
| 150 | + | |
| 142 | 151 | (defface fsvn-diff-add-face |
| 143 | 152 | '((((class color) (background light)) |
| 144 | 153 | :foreground "blue1") |
| @@ -1,3 +1,11 @@ | ||
| 1 | +2012-03-19 Masahiro Hayashi (林 雅博) <mhayashi1120@gmail.com> | |
| 2 | + | |
| 3 | + * Fix: fancy redraw (ex: mm-mode) | |
| 4 | + | |
| 5 | +2012-03-03 Masahiro Hayashi (林 雅博) <mhayashi1120@gmail.com> | |
| 6 | + | |
| 7 | + * Add: new face `fsvn-match-face' (Not used yet) | |
| 8 | + | |
| 1 | 9 | 2012-02-29 Masahiro Hayashi (林 雅博) <mhayashi1120@gmail.com> |
| 2 | 10 | |
| 3 | 11 | * Add: `fsvn-process-list-default-display-function' that controls |
| @@ -118,25 +118,35 @@ | ||
| 118 | 118 | (interactive |
| 119 | 119 | (list (fsvn-log-list-read-search-regexp))) |
| 120 | 120 | (catch 'found |
| 121 | - (while (and (fsvn-log-list-point-revision) | |
| 122 | - (not (eobp))) | |
| 123 | - (let* ((buffers (buffer-list)) | |
| 124 | - (proc (fsvn-log-list-diff-previous)) | |
| 125 | - (buffer (process-buffer proc))) | |
| 126 | - (while (not (memq (process-status proc) '(exit signal))) | |
| 127 | - (sit-for 0.2)) | |
| 128 | - ;;TOOD restrict to "^[+-]" ? | |
| 129 | - ;;TODO log message too? sibling filename too? | |
| 130 | - (when (buffer-live-p buffer) | |
| 131 | - (with-current-buffer buffer | |
| 132 | - (goto-char (point-min)) | |
| 133 | - (when (re-search-forward regexp nil t) | |
| 134 | - ;;TODO colorlize? | |
| 135 | - (message "Match found.") | |
| 136 | - (throw 'found t))) | |
| 137 | - (unless (memq buffer buffers) | |
| 138 | - (kill-buffer buffer))) | |
| 139 | - (fsvn-log-list-next-line))) | |
| 121 | + (let (rev) | |
| 122 | + (while (and (setq rev (fsvn-log-list-point-revision)) | |
| 123 | + (not (eobp))) | |
| 124 | + (message "Searching revision %s..." rev) | |
| 125 | + (let* ((buffers (buffer-list)) | |
| 126 | + (proc (fsvn-log-list-diff-previous)) | |
| 127 | + (buffer (process-buffer proc))) | |
| 128 | + (while (not (memq (process-status proc) '(exit signal))) | |
| 129 | + (sit-for 0.2)) | |
| 130 | + ;;TOOD restrict to "^[+-]" ? | |
| 131 | + ;;TODO log message too? sibling filename too? | |
| 132 | + (when (buffer-live-p buffer) | |
| 133 | + (save-selected-window | |
| 134 | + (select-window (get-buffer-window buffer)) | |
| 135 | + (goto-char (point-min)) | |
| 136 | + (when (re-search-forward regexp nil t) | |
| 137 | + ;; colorize | |
| 138 | + (let ((ov (make-overlay (match-beginning 0) (match-end 0)))) | |
| 139 | + (overlay-put ov 'face fsvn-match-face)) | |
| 140 | + (message "Match found.") | |
| 141 | + ;;TODO delete overlay? | |
| 142 | + ;; (let ((next-event | |
| 143 | + ;; (let ((inhibit-quit t)) | |
| 144 | + ;; (read-event)))) | |
| 145 | + ;; (setq unread-command-events (list next-event))) | |
| 146 | + (throw 'found t))) | |
| 147 | + (unless (memq buffer buffers) | |
| 148 | + (kill-buffer buffer))) | |
| 149 | + (fsvn-log-list-next-line)))) | |
| 140 | 150 | (message "Not found."))) |
| 141 | 151 | |
| 142 | 152 |
| @@ -387,6 +387,9 @@ | ||
| 387 | 387 | (setq file-handler (cons fsvn-magic-file-name-regexp 'fsvn-magic-file-name-handler)) |
| 388 | 388 | (add-to-list 'file-name-handler-alist file-handler)) |
| 389 | 389 | (add-hook 'pre-command-hook 'fsvn-magic-clear-cache-if-toplevel) |
| 390 | + ;; redraw mode-line `kill-all-local-varable' destroy after `vc-find-file' | |
| 391 | + ;; advice | |
| 392 | + (add-hook 'after-change-major-mode-hook 'fsvn-ui-fancy-redraw) | |
| 390 | 393 | ;; iswitchb ignore buffers |
| 391 | 394 | (mapc |
| 392 | 395 | (lambda (regexp) |
| @@ -398,6 +401,7 @@ | ||
| 398 | 401 | (setq find-directory-functions (delq 'fsvn-browse/dired-noselect find-directory-functions)) |
| 399 | 402 | (setq file-name-handler-alist (delq file-handler file-name-handler-alist)) |
| 400 | 403 | (remove-hook 'pre-command-hook 'fsvn-magic-clear-cache-if-toplevel) |
| 404 | + (remove-hook 'after-change-major-mode-hook 'fsvn-ui-fancy-redraw) | |
| 401 | 405 | (mapc |
| 402 | 406 | (lambda (regexp) |
| 403 | 407 | (setq iswitchb-buffer-ignore (delete regexp iswitchb-buffer-ignore))) |
| @@ -10,7 +10,7 @@ | ||
| 10 | 10 | ;; requires extended emacs-wiki-mode that have not been published. |
| 11 | 11 | |
| 12 | 12 | (defvar fsvn-publish-doc-directory |
| 13 | - "~/.emacs.d/util/fsvn/DOC") | |
| 13 | + "~/.emacs.d/dev/fsvn/DOC") | |
| 14 | 14 | |
| 15 | 15 | (defconst fsvn-publish-template-directory |
| 16 | 16 | (expand-file-name "Templates" fsvn-publish-doc-directory)) |