Now on revision 105319. ------------------------------------------------------------ revno: 105319 committer: Deniz Dogan branch nick: emacs-trunk timestamp: Mon 2011-07-25 03:44:10 +0200 message: * lisp/image.el (insert-image): Clarifying docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-24 09:56:26 +0000 +++ lisp/ChangeLog 2011-07-25 01:44:10 +0000 @@ -1,3 +1,7 @@ +2011-07-25 Deniz Dogan + + * image.el (insert-image): Clarifying docstring. + 2011-07-24 Michael Albinus * net/tramp-sh.el (tramp-barf-unless-okay): Return the value of === modified file 'lisp/image.el' --- lisp/image.el 2011-07-17 15:57:47 +0000 +++ lisp/image.el 2011-07-25 01:44:10 +0000 @@ -413,8 +413,8 @@ (defun insert-image (image &optional string area slice) "Insert IMAGE into current buffer at point. IMAGE is displayed by inserting STRING into the current buffer -with a `display' property whose value is the image. STRING is -defaulted if you omit it. +with a `display' property whose value is the image. STRING +defaults to the empty string if you omit it. AREA is where to display the image. AREA nil or omitted means display it in the text area, a value of `left-margin' means display it in the left marginal area, a value of `right-margin' ------------------------------------------------------------ revno: 105318 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-07-24 22:15:15 +0000 message: nnimap.el (nnimap-make-thread-query): Quote message-ids for gmail. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-07-24 00:19:29 +0000 +++ lisp/gnus/ChangeLog 2011-07-24 22:15:15 +0000 @@ -1,3 +1,7 @@ +2011-07-24 Andrew Cohen + + * nnimap.el (nnimap-make-thread-query): Quote message-ids for gmail. + 2011-07-23 Andrew Cohen * nnir.el (nnir-search-thread): New function to make an nnir group === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-07-24 00:19:29 +0000 +++ lisp/gnus/nnimap.el 2011-07-24 22:15:15 +0000 @@ -1947,13 +1947,13 @@ (refs (split-string (or (mail-header-references header) ""))) - (value - (format - "(OR HEADER REFERENCES %s HEADER Message-Id %s)" - id id))) + (value + (format + "(OR HEADER REFERENCES %S HEADER Message-Id %S)" + id id))) (dolist (refid refs value) (setq value (format - "(OR (OR HEADER Message-Id %s HEADER REFERENCES %s) %s)" + "(OR (OR HEADER Message-Id %S HEADER REFERENCES %S) %s)" refid refid value))))) ------------------------------------------------------------ revno: 105317 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2011-07-24 10:01:58 -0400 message: * src/xml.c: Fix Lisp_Object/int mixup. diff: === modified file 'src/xml.c' --- src/xml.c 2011-07-23 18:31:25 +0000 +++ src/xml.c 2011-07-24 14:01:58 +0000 @@ -128,13 +128,13 @@ Lisp_Object r = Qnil; while (n) { - if (r != Qnil) + if (!NILP (r)) result = Fcons (r, result); r = make_dom (n); n = n->next; } - if (result == Qnil) + if (NILP (result)) result = r; else result = Fcons (intern ("top"), ------------------------------------------------------------ revno: 105316 committer: Michael Albinus branch nick: trunk timestamp: Sun 2011-07-24 11:56:26 +0200 message: * net/tramp-sh.el (tramp-barf-unless-okay): Return the value of `tramp-send-command-and-check' if there is no error. (tramp-send-command-and-read): Suppress *all* errors if NOERROR. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-22 12:53:46 +0000 +++ lisp/ChangeLog 2011-07-24 09:56:26 +0000 @@ -1,3 +1,9 @@ +2011-07-24 Michael Albinus + + * net/tramp-sh.el (tramp-barf-unless-okay): Return the value of + `tramp-send-command-and-check' if there is no error. + (tramp-send-command-and-read): Suppress *all* errors if NOERROR. + 2011-07-22 Alan Mackenzie Prevent cc-langs.elc being loaded at run time. === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-07-08 14:25:25 +0000 +++ lisp/net/tramp-sh.el 2011-07-24 09:56:26 +0000 @@ -4505,27 +4505,30 @@ "Run COMMAND, check exit status, throw error if exit status not okay. Similar to `tramp-send-command-and-check' but accepts two more arguments FMT and ARGS which are passed to `error'." - (unless (tramp-send-command-and-check vec command) - (apply 'tramp-error vec 'file-error fmt args))) + (or (tramp-send-command-and-check vec command) + (apply 'tramp-error vec 'file-error fmt args))) (defun tramp-send-command-and-read (vec command &optional noerror) "Run COMMAND and return the output, which must be a Lisp expression. In case there is no valid Lisp expression and NOERROR is nil, it raises an error." - (tramp-barf-unless-okay vec command "`%s' returns with error" command) - (with-current-buffer (tramp-get-connection-buffer vec) - ;; Read the expression. - (goto-char (point-min)) - (condition-case nil - (prog1 (read (current-buffer)) - ;; Error handling. - (when (re-search-forward "\\S-" (point-at-eol) t) - (error nil))) - (error (unless noerror - (tramp-error - vec 'file-error - "`%s' does not return a valid Lisp expression: `%s'" - command (buffer-string))))))) + (when (if noerror + (tramp-send-command-and-check vec command) + (tramp-barf-unless-okay + vec command "`%s' returns with error" command)) + (with-current-buffer (tramp-get-connection-buffer vec) + ;; Read the expression. + (goto-char (point-min)) + (condition-case nil + (prog1 (read (current-buffer)) + ;; Error handling. + (when (re-search-forward "\\S-" (point-at-eol) t) + (error nil))) + (error (unless noerror + (tramp-error + vec 'file-error + "`%s' does not return a valid Lisp expression: `%s'" + command (buffer-string)))))))) (defun tramp-convert-file-attributes (vec attr) "Convert file-attributes ATTR generated by perl script, stat or ls.