Permalink
Browse files

Merge branch 'oyster-id-error' into thumbnail-identify-bugfix

  • Loading branch information...
2 parents cd846ff + 3652351 commit 11378e936f4c5441fbfd0cb320e63bbcdec3f6ec MIZUNUMA Yuto committed Jun 19, 2012
Showing with 10 additions and 6 deletions.
  1. +4 −0 ChangeLog
  2. +6 −6 navi2ch-oyster.el
  3. 0 navi2ch-thumbnail.el
View
4 ChangeLog 100755 → 100644
@@ -1,3 +1,7 @@
+2012-06-19 MIZUNUMA Yuto <mizmiz@sf.net>
+
+ * navi2ch-oyster.el (navi2ch-oyster-login): bugfix
+
2012-06-18 MIZUNUMA Yuto <mizmiz@sf.net>
* navi2ch-thumbnail.el (navi2ch-thumbnail-image-jpeg-identify):
View
@@ -312,12 +312,12 @@ DIFF $B$,(B non-nil $B$J$i$P:9J,$r<hF@$9$k!#(B
(cond
((string= status "200")
(setq navi2ch-oyster-session-id (navi2ch-oyster-get-session-id-from-proc proc))
- (when (or (not navi2ch-oyster-session-id)
- (string-match "ERROR:.+" navi2ch-oyster-session-id))
- (error "$B!|(BID$B<hF@(BERROR $B$*$=$i$/4|8B@Z$l(B")
- (setq navi2ch-oyster-session-id nil))
- (message "$B!|(BID$B<hF@(B ID=%s" navi2ch-oyster-session-id))
- ((string= status "400")
+ (if (and navi2ch-oyster-session-id
+ (not (string-match "ERROR:.+" navi2ch-oyster-session-id)))
+ (message "$B!|(BID$B<hF@(B ID=%s" navi2ch-oyster-session-id)
+ (setq navi2ch-oyster-session-id nil)
+ (error "$B!|(BID$B<hF@(BERROR $B$*$=$i$/4|8B@Z$l(B")))
+ ((String= status "400")
(message "$B!|(BID$B<hF@(BERROR $B%5!<%PITD4(B %s" status)))
(kill-buffer buf))))
View
0 navi2ch-thumbnail.el 100755 → 100644
No changes.

0 comments on commit 11378e9

Please sign in to comment.