From: teranisi Date: Mon, 16 Apr 2001 11:39:39 +0000 (+0000) Subject: * wl-summary.el (wl-summary-message-regexp): Fixed number regexp. X-Git-Tag: wl-2_6-root^3~46 X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fwanderlust.git;a=commitdiff_plain;h=cf62e98ee5c19a9011b1d178253da94efc0963c0 * wl-summary.el (wl-summary-message-regexp): Fixed number regexp. (All other related portions are changed) * elmo-shimbun.el (elmo-folder-initialize): Fixed for "@gnome.gnome-1.4-list". --- diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 40e5db7..f8700f7 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -5,6 +5,7 @@ (elmo-folder-set-plugged): Ditto. (elmo-shimbun-msgdb-create-entity): Do nothing if there's no header. (elmo-folder-list-messages-internal): Return t if unplugged. + (elmo-folder-initialize): Fixed for "@gnome.gnome-1.4-list". * elmo-multi.el (elmo-folder-list-messages-internal): Fixed problem when elmo-folder-list-messages-internal method of children returns t. diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el index 1fb7e0e..67b90e0 100644 --- a/elmo/elmo-shimbun.el +++ b/elmo/elmo-shimbun.el @@ -40,7 +40,10 @@ (luna-define-method elmo-folder-initialize ((folder elmo-shimbun-folder) name) - (let ((server-group (split-string name "\\."))) + (let ((server-group (if (string-match "\\([^.]+\\)\\." name) + (list (elmo-match-string 1 name) + (substring name (match-end 0))) + (list name)))) (if (nth 0 server-group) ; server (elmo-shimbun-folder-set-shimbun-internal folder diff --git a/wl/ChangeLog b/wl/ChangeLog index 6d69529..c56feb4 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,8 @@ 2001-04-16 Yuuichi Teranishi + * wl-summary.el (wl-summary-message-regexp): Fixed number regexp. + (All other related portions are changed) + * wl.el (wl-plugged-change): Use '<' instead of '<='. * wl-folder.el (wl-folder-check-one-entity): Fixed last change again. diff --git a/wl/wl-summary.el b/wl/wl-summary.el index ad0dcbf..e1db38f 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -125,7 +125,7 @@ (defvar wl-summary-get-petname-function 'wl-address-get-petname-1) -(defvar wl-summary-message-regexp "^ *\\([0-9-]+\\)") +(defvar wl-summary-message-regexp "^ *\\(-?[0-9]+\\)") (defvar wl-summary-shell-command-last "") @@ -1332,7 +1332,7 @@ If ARG is non-nil, checking is omitted." (goto-char (point-min)) (while (not (eobp)) (beginning-of-line) - (when (looking-at "^ *\\([0-9-]+\\)[^0-9]\\([^0-9]\\)") + (when (looking-at "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9]\\)") (setq mark (wl-match-buffer 2)) (setq msg (string-to-int (wl-match-buffer 1))) (if (or (and (null prefetch-marks) @@ -1386,7 +1386,7 @@ If ARG is non-nil, checking is omitted." (save-excursion (save-match-data (beginning-of-line) - (when (looking-at "^ *\\([0-9-]+\\)[^0-9]\\([^0-9]\\)") + (when (looking-at "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9]\\)") (goto-char (match-beginning 2)) (let ((inhibit-read-only t) (buffer-read-only nil) @@ -1581,7 +1581,7 @@ If ARG is non-nil, checking is omitted." (elmo-folder-mark-as-read folder (wl-summary-collect-unread mark-alist)) (save-excursion (goto-char (point-min)) - (while (re-search-forward "^ *\\([0-9-]+\\)[^0-9]\\([^0-9 ]\\)" nil t) + (while (re-search-forward "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9 ]\\)" nil t) (setq msg (string-to-int (wl-match-buffer 1))) (setq mark (wl-match-buffer 2)) (when (and (not (string= mark wl-summary-important-mark)) @@ -1632,7 +1632,7 @@ If ARG is non-nil, checking is omitted." mark number unread new-mark) ;;; (re-search-backward "^ *[0-9]+..[0-9]+/[0-9]+" nil t) ; set cursor line (beginning-of-line) - (when (looking-at "^ *\\([0-9-]+\\)[^0-9]\\([^0-9]\\)") + (when (looking-at "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9]\\)") (progn (setq mark (wl-match-buffer 2)) (cond @@ -1677,7 +1677,7 @@ If ARG is non-nil, checking is omitted." (message "Resuming cache status...") (save-excursion (goto-char (point-min)) - (while (re-search-forward "^ *\\([0-9-]+\\)[^0-9]\\([^0-9]\\)" nil t) + (while (re-search-forward "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9]\\)" nil t) (setq msg (string-to-int (wl-match-buffer 1))) (setq mark (wl-match-buffer 2)) @@ -2189,7 +2189,7 @@ If ARG is non-nil, checking is omitted." (buffer-read-only nil) msg-num cur-mark) - (when (looking-at "^ *\\([0-9-]+\\)\\([^0-9]\\)") + (when (looking-at "^ *\\(-?[0-9]+\\)\\([^0-9]\\)") (setq msg-num (string-to-int (wl-match-buffer 1))) (setq cur-mark (wl-match-buffer 2)) (when (member cur-mark (list " " @@ -2256,7 +2256,7 @@ If ARG is non-nil, checking is omitted." (defun wl-summary-message-number () (save-excursion (beginning-of-line) - (if (looking-at "^ *\\([0-9-]+\\)") + (if (looking-at "^ *\\(-?[0-9]+\\)") (string-to-int (wl-match-buffer 1)) nil))) @@ -2894,7 +2894,7 @@ If ARG, without confirm." (re-search-forward (format (concat "^ *\\(" (if number (int-to-string number) - "[0-9]+") + "-?[0-9]+") "\\)[^0-9]\\(%s\\|%s\\)") wl-summary-read-uncached-mark " ") eol t)) @@ -3416,7 +3416,7 @@ If optional argument NUMBER is specified, unmark message specified by NUMBER." (setq visible t)) ;; Delete mark on buffer. (when (and visible - (looking-at "^ *\\([0-9]+\\)\\([^0-9]\\)")) + (looking-at "^ *\\(-?[0-9]+\\)\\([^0-9]\\)")) (goto-char (match-end 2)) (or number (setq number (string-to-int (wl-match-buffer 1)))) @@ -3590,7 +3590,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (defun wl-summary-delete-all-mark (mark) (goto-char (point-min)) (let ((case-fold-search nil)) - (while (re-search-forward (format "^ *[0-9]+%s" + (while (re-search-forward (format "^ *-?[0-9]+%s" (regexp-quote mark)) nil t) (wl-summary-unmark)) (cond ((string= mark "*") @@ -3721,7 +3721,7 @@ If ARG, exit virtual folder." (buffer-read-only nil) msg-num cur-mark) - (when (looking-at "^ *\\([0-9]+\\)\\([^0-9]\\)") + (when (looking-at "^ *\\(-?[0-9]+\\)\\([^0-9]\\)") (setq msg-num (string-to-int (wl-match-buffer 1))) (setq cur-mark (wl-match-buffer 2)) (goto-char (match-end 1)) @@ -3772,7 +3772,7 @@ If ARG, exit virtual folder." (when (wl-summary-jump-to-msg (car mlist)) (wl-summary-unmark) (when new-mark - (when (looking-at "^ *[0-9]+[^0-9]\\([^0-9]\\)") + (when (looking-at "^ *-?[0-9]+[^0-9]\\([^0-9]\\)") (delete-region (match-beginning 1) (match-end 1))) (goto-char (match-beginning 1)) (insert new-mark) @@ -3973,7 +3973,7 @@ If ARG, exit virtual folder." (beginning-of-line) (if (or (not visible) (looking-at - (format "^ *\\([0-9]+\\)[^0-9]\\(%s\\|%s\\|%s\\|%s\\).*$" + (format "^ *\\(-?[0-9]+\\)[^0-9]\\(%s\\|%s\\|%s\\|%s\\).*$" (regexp-quote wl-summary-read-uncached-mark) (regexp-quote wl-summary-unread-uncached-mark) (regexp-quote wl-summary-unread-cached-mark) @@ -4070,7 +4070,7 @@ If ARG, exit virtual folder." "..../..") nil t)) ; set cursor line ) (beginning-of-line) - (if (re-search-forward "^ *\\([0-9]+\\)[^0-9]\\([^0-9]\\)" eol t) + (if (re-search-forward "^ *\\(-?[0-9]+\\)[^0-9]\\([^0-9]\\)" eol t) (progn (setq number (or number (string-to-int (wl-match-buffer 1)))) (setq mark (or mark (wl-match-buffer 2))) @@ -4230,7 +4230,8 @@ If ARG, exit virtual folder." (setq wl-summary-buffer-number-column (or (if (and update - (setq end (if (re-search-forward "^ *[0-9-]+[^0-9]" nil t) + (setq end (if (re-search-forward + "^ *-?[0-9]+[^0-9]" nil t) (point)))) (- end (progn (beginning-of-line) (point)) 1)) (wl-get-assoc-list-value wl-summary-number-column-alist