Re: FIXMEs in imap.el and nnimap.el

[Ted Zlatanov <tzz@lifelogs.com>]

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

On Thu, 01 Jan 2009 19:55:36 +0100 Reiner Steib <reinersteib+gmane@imap.cc> wrote: 

RS> On Tue, Dec 23 2008, Dave Love wrote:
>> Sorry it's conflated with some random doc/commentary changes -- I
>> should use darcs in parallel...  You might want to note or zap the
>> `fixme' comments in particular.

RS> Thanks, I've committed them with minor editing (sorry that this will
RS> cause merge conflicts for you):
RS> <http://article.gmane.org/gmane.emacs.gnus.commits/6101>

RS> Would someone take a look at the FIXMEs, please?

I don't know about the rest of them, but the easy patch, which merges
copyuid and appenduid handling, is appended below.  It's really trivial
and the code is almost exactly the same so if someone wants to try it to
verify it works, I'll commit it.

Ted


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: copyuid+appenduid.merge.patch --]
[-- Type: text/x-diff, Size: 2844 bytes --]

Index: imap.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/imap.el,v
retrieving revision 7.50
diff -c -r7.50 imap.el
*** imap.el	1 Jan 2009 18:50:34 -0000	7.50
--- imap.el	2 Jan 2009 22:14:42 -0000
***************
*** 1816,1830 ****
         (signal (car data) (cdr data))))))
  
  (defun imap-message-copyuid-1 (mailbox)
    (if (imap-capability 'UIDPLUS)
!       (list (nth 0 (imap-mailbox-get-1 'copyuid mailbox))
! 	    (string-to-number (nth 2 (imap-mailbox-get-1 'copyuid mailbox))))
      (let ((old-mailbox imap-current-mailbox)
  	  (state imap-state)
  	  (imap-message-data (make-vector 2 0)))
        (when (imap-mailbox-examine-1 mailbox)
  	(prog1
! 	    (and (imap-fetch-safe '("*" . "*:*") "UID")
  		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
  		       (apply 'max (imap-message-map
  				    (lambda (uid prop) uid) 'UID))))
--- 1816,1838 ----
         (signal (car data) (cdr data))))))
  
  (defun imap-message-copyuid-1 (mailbox)
+   (imap-message-copyuid-or-appenduid-1 mailbox t))
+ 
+ (defun imap-message-appenduid-1 (mailbox)
+   (imap-message-copyuid-or-appenduid-1 mailbox nil))
+ 
+ (defun imap-message-copyuid-or-appenduid-1 (mailbox copy)
    (if (imap-capability 'UIDPLUS)
!       (if copy
! 	  (list (nth 0 (imap-mailbox-get-1 'copyuid mailbox))
! 		(string-to-number (nth 2 (imap-mailbox-get-1 'copyuid mailbox))))
! 	(imap-mailbox-get-1 'appenduid mailbox))
      (let ((old-mailbox imap-current-mailbox)
  	  (state imap-state)
  	  (imap-message-data (make-vector 2 0)))
        (when (imap-mailbox-examine-1 mailbox)
  	(prog1
! 	    (and (imap-fetch-safe '("*" "*:*") "UID")
  		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
  		       (apply 'max (imap-message-map
  				    (lambda (uid prop) uid) 'UID))))
***************
*** 1860,1883 ****
  	    (or no-copyuid
  		(imap-message-copyuid-1 mailbox)))))))
  
- ;; FIXME: Amalgamate with imap-message-copyuid-1, using an extra arg, since it
- ;; shares most of the code?  -- fx
- (defun imap-message-appenduid-1 (mailbox)
-   (if (imap-capability 'UIDPLUS)
-       (imap-mailbox-get-1 'appenduid mailbox)
-     (let ((old-mailbox imap-current-mailbox)
- 	  (state imap-state)
- 	  (imap-message-data (make-vector 2 0)))
-       (when (imap-mailbox-examine-1 mailbox)
- 	(prog1
- 	    (and (imap-fetch-safe '("*" "*:*") "UID")
- 		 (list (imap-mailbox-get-1 'uidvalidity mailbox)
- 		       (apply 'max (imap-message-map
- 				    (lambda (uid prop) uid) 'UID))))
- 	  (if old-mailbox
- 	      (imap-mailbox-select old-mailbox (eq state 'examine))
- 	    (imap-mailbox-unselect)))))))
- 
  (defun imap-message-appenduid (mailbox &optional buffer)
    (with-current-buffer (or buffer (current-buffer))
      (imap-message-appenduid-1 (imap-utf7-encode mailbox))))
--- 1868,1873 ----