------------------------------------------------------------ revno: 116230 fixes bug: http://debbugs.gnu.org/16558 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-02-01 11:22:51 +0200 message: Fix bug #16558 with w32-shell-execute on remote file names. src/w32fns.c (Fw32_shell_execute): Don't call file-exists-p for DOCUMENT that is a "remote" file name, i.e. a file-handler exists for it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-01-31 02:43:03 +0000 +++ src/ChangeLog 2014-02-01 09:22:51 +0000 @@ -1,3 +1,9 @@ +2014-02-01 Eli Zaretskii + + * w32fns.c (Fw32_shell_execute): Don't call file-exists-p for + DOCUMENT that is a "remote" file name, i.e. a file-handler exists + for it. (Bug#16558) + 2014-01-30 Andreas Schwab * process.c (create_process): Reset SIGPROF handler in the child. === modified file 'src/w32fns.c' --- src/w32fns.c 2014-01-29 10:29:14 +0000 +++ src/w32fns.c 2014-02-01 09:22:51 +0000 @@ -6892,7 +6892,8 @@ #ifndef CYGWIN int use_unicode = w32_unicode_filenames; char *doc_a = NULL, *params_a = NULL, *ops_a = NULL; - Lisp_Object absdoc; + Lisp_Object absdoc, handler; + struct gcpro gcpro1; #endif CHECK_STRING (document); @@ -6927,10 +6928,24 @@ does not have to be a file, it can be a URL, for example. So we make it absolute only if it is an existing file; if it is a file that does not exist, tough. */ + GCPRO1 (absdoc); absdoc = Fexpand_file_name (document, Qnil); - if (!NILP (Ffile_exists_p (absdoc))) - document = absdoc; - document = ENCODE_FILE (document); + /* Don't call file handlers for file-exists-p, since they might + attempt to access the file, which could fail or produce undesired + consequences, see bug#16558 for an example. */ + handler = Ffind_file_name_handler (absdoc, Qfile_exists_p); + if (NILP (handler)) + { + Lisp_Object absdoc_encoded = ENCODE_FILE (absdoc); + + if (faccessat (AT_FDCWD, SSDATA (absdoc_encoded), F_OK, AT_EACCESS) == 0) + document = absdoc_encoded; + else + document = ENCODE_FILE (document); + } + else + document = ENCODE_FILE (document); + UNGCPRO; if (use_unicode) { wchar_t document_w[MAX_PATH], current_dir_w[MAX_PATH]; ------------------------------------------------------------ revno: 116229 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Sat 2014-02-01 00:26:31 -0800 message: nnir mark update fix * nnir.el (nnir-request-update-mark): Don't try to update the source group if we can't find it (bug#16611). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-01-31 08:33:13 +0000 +++ lisp/gnus/ChangeLog 2014-02-01 08:26:31 +0000 @@ -1,3 +1,8 @@ +2014-02-01 Lars Ingebrigtsen + + * nnir.el (nnir-request-update-mark): Don't try to update the source + group if we can't find it (bug#16611). + 2014-01-31 Lars Ingebrigtsen * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/nnir.el 2014-02-01 08:26:31 +0000 @@ -834,7 +834,8 @@ (deffoo nnir-request-update-mark (group article mark) (let ((artgroup (nnir-article-group article)) (artnumber (nnir-article-number article))) - (gnus-request-update-mark artgroup artnumber mark))) + (when (and artgroup artnumber) + (gnus-request-update-mark artgroup artnumber mark)))) (deffoo nnir-request-set-mark (group actions &optional server) (nnir-possibly-change-group group server) ------------------------------------------------------------ revno: 116228 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-01-31 23:55:57 -0800 message: Check in forgotten ChangeLog entry from previous nbutlast change diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 21:44:11 +0000 +++ lisp/ChangeLog 2014-02-01 07:55:57 +0000 @@ -1,3 +1,8 @@ +2014-02-01 Lars Ingebrigtsen + + * subr.el (butlast): Document what an omitted N means (bug#13437). + (nbutlast): Ditto. + 2014-01-31 Lars Ingebrigtsen * net/shr.el (shr-generic): Make into a defsubst to make the stack ------------------------------------------------------------ revno: 116227 fixes bug: http://debbugs.gnu.org/13437 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-01-31 23:54:29 -0800 message: * subr.el (butlast): Document what an omitted N means. * subr.el (butlast): Document what an omitted N means. (nbutlast): Ditto. diff: === modified file 'lisp/subr.el' --- lisp/subr.el 2014-01-24 04:11:48 +0000 +++ lisp/subr.el 2014-02-01 07:54:29 +0000 @@ -364,12 +364,15 @@ (nthcdr (1- (safe-length list)) list)))) (defun butlast (list &optional n) - "Return a copy of LIST with the last N elements removed." + "Return a copy of LIST with the last N elements removed. +If N is omitted or nil, the last element is removed from the +copy." (if (and n (<= n 0)) list (nbutlast (copy-sequence list) n))) (defun nbutlast (list &optional n) - "Modifies LIST to remove the last N elements." + "Modifies LIST to remove the last N elements. +If N is omitted or nil, remove the last element." (let ((m (length list))) (or n (setq n 1)) (and (< n m) ------------------------------------------------------------ revno: 116226 fixes bug: http://debbugs.gnu.org/15882 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-01-31 13:44:11 -0800 message: Make shr respect privacy when viewing documents with SVG images (shr-tag-svg): Respect `shr-inhibit-images'. (shr-dom-to-xml): Respect `shr-blocked-images'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 21:08:13 +0000 +++ lisp/ChangeLog 2014-01-31 21:44:11 +0000 @@ -2,6 +2,8 @@ * net/shr.el (shr-generic): Make into a defsubst to make the stack depth shallower (bug#16587). + (shr-tag-svg): Respect `shr-inhibit-images'. + (shr-dom-to-xml): Respect `shr-blocked-images' (bug#15882). 2014-01-31 Dmitry Gutov === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-01-31 21:08:13 +0000 +++ lisp/net/shr.el 2014-01-31 21:44:11 +0000 @@ -972,11 +972,18 @@ (defun shr-dom-to-xml (dom) "Convert DOM into a string containing the xml representation." (let ((arg " ") - (text "")) + (text "") + url) (dolist (sub (cdr dom)) (cond ((listp (cdr sub)) - (setq text (concat text (shr-dom-to-xml sub)))) + ;; Ignore external image definitions if required. + ;; + (when (or (not (eq (car sub) 'image)) + (not (setq url (cdr (assq ':xlink:href (cdr sub))))) + (not shr-blocked-images) + (not (string-match shr-blocked-images url))) + (setq text (concat text (shr-dom-to-xml sub))))) ((eq (car sub) 'text) (setq text (concat text (cdr sub)))) (t @@ -990,7 +997,8 @@ (car dom)))) (defun shr-tag-svg (cont) - (when (image-type-available-p 'svg) + (when (and (image-type-available-p 'svg) + (not shr-inhibit-images)) (funcall shr-put-image-function (shr-dom-to-xml (cons 'svg cont)) "SVG Image"))) ------------------------------------------------------------ revno: 116225 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Fri 2014-01-31 13:08:13 -0800 message: Make shr-generic into a defsusbt to make the stack shallower * net/shr.el (shr-generic): Make into a defsubst to make the stack depth shallower. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 17:13:49 +0000 +++ lisp/ChangeLog 2014-01-31 21:08:13 +0000 @@ -1,3 +1,8 @@ +2014-01-31 Lars Ingebrigtsen + + * net/shr.el (shr-generic): Make into a defsubst to make the stack + depth shallower (bug#16587). + 2014-01-31 Dmitry Gutov * progmodes/ruby-mode.el (ruby-align-chained-calls): New option. === modified file 'lisp/net/shr.el' --- lisp/net/shr.el 2014-01-25 00:52:16 +0000 +++ lisp/net/shr.el 2014-01-31 21:08:13 +0000 @@ -359,6 +359,14 @@ (push (shr-transform-dom sub) result))) (nreverse result))) +(defsubst shr-generic (cont) + (dolist (sub cont) + (cond + ((eq (car sub) 'text) + (shr-insert (cdr sub))) + ((listp (cdr sub)) + (shr-descend sub))))) + (defun shr-descend (dom) (let ((function (or @@ -392,14 +400,6 @@ (cdr (assq 'color shr-stylesheet)) (cdr (assq 'background-color shr-stylesheet))))))) -(defun shr-generic (cont) - (dolist (sub cont) - (cond - ((eq (car sub) 'text) - (shr-insert (cdr sub))) - ((listp (cdr sub)) - (shr-descend sub))))) - (defmacro shr-char-breakable-p (char) "Return non-nil if a line can be broken before and after CHAR." `(aref fill-find-break-point-function-table ,char)) ------------------------------------------------------------ revno: 116224 fixes bug: http://debbugs.gnu.org/16593 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2014-01-31 19:33:12 +0200 message: Fixup the documentation for the previous change * etc/NEWS: Mention `ruby-align-chained-calls'. * lisp/progmodes/ruby-mode.el (ruby-align-chained-calls): Update the docstring and add :version tag. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-01-31 01:56:00 +0000 +++ etc/ChangeLog 2014-01-31 17:33:12 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Dmitry Gutov + + * NEWS: Mention `ruby-align-chained-calls'. + 2014-01-31 Alex Schroeder (tiny change) * gnus-tut.txt (Message-ID): Typo fix (bug#15556). === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 09:41:54 +0000 +++ etc/NEWS 2014-01-31 17:33:12 +0000 @@ -719,6 +719,9 @@ *** New option `ruby-align-to-stmt-keywords'. --- +*** New option `ruby-align-chained-calls'. + +--- *** More Ruby file types have been added to `auto-mode-alist'. ** Search and Replace === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2014-01-31 17:13:49 +0000 +++ lisp/progmodes/ruby-mode.el 2014-01-31 17:33:12 +0000 @@ -265,13 +265,16 @@ :version "24.4") (defcustom ruby-align-chained-calls nil - "If non-nil, chained method calls on multiple lines will be -aligned to the same column. + "If non-nil, align chained method calls. + +Each method call on a separate line will be aligned to the column +of its parent. Only has effect when `ruby-use-smie' is t." :type 'boolean :group 'ruby - :safe 'booleanp) + :safe 'booleanp + :version "24.4") (defcustom ruby-deep-arglist t "Deep indent lists in parenthesis when non-nil. ------------------------------------------------------------ revno: 116223 fixes bug: http://debbugs.gnu.org/16593 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2014-01-31 19:13:49 +0200 message: Implement user option ruby-align-chained-calls * lisp/progmodes/ruby-mode.el (ruby-align-chained-calls): New option. (ruby-smie-grammar): Make "." right-associative. Make its priority lower than the ternary and all binary operators. (ruby-smie-rules): Indent "(" relative to the first non-"." parent, or the first "." parent at indentation. Use `ruby-align-chained-calls' for indentation of "." tokens. * test/automated/ruby-mode-tests.el (ruby-align-chained-calls): New test. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 09:41:54 +0000 +++ lisp/ChangeLog 2014-01-31 17:13:49 +0000 @@ -1,3 +1,13 @@ +2014-01-31 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-align-chained-calls): New option. + (ruby-smie-grammar): Make "." right-associative. Make its priority + lower than the ternary and all binary operators. + (ruby-smie-rules): Indent "(" relative to the first non-"." + parent, or the first "." parent at indentation. Use + `ruby-align-chained-calls' for indentation of "." tokens. + (Bug#16593) + 2014-01-31 Juri Linkov * sort.el (delete-duplicate-lines): Remove `:weakness 'key' === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2014-01-17 03:15:02 +0000 +++ lisp/progmodes/ruby-mode.el 2014-01-31 17:13:49 +0000 @@ -264,6 +264,15 @@ :safe 'listp :version "24.4") +(defcustom ruby-align-chained-calls nil + "If non-nil, chained method calls on multiple lines will be +aligned to the same column. + +Only has effect when `ruby-use-smie' is t." + :type 'boolean + :group 'ruby + :safe 'booleanp) + (defcustom ruby-deep-arglist t "Deep indent lists in parenthesis when non-nil. Also ignores spaces after parenthesis when `space'. @@ -350,10 +359,10 @@ ;; but avoids lots of conflicts: (exp "and" exp) (exp "or" exp)) (exp (exp1) (exp "," exp) (exp "=" exp) - (id " @ " exp) - (exp "." id)) + (id " @ " exp)) (exp1 (exp2) (exp2 "?" exp1 ":" exp1)) - (exp2 ("def" insts "end") + (exp2 (exp3) (exp3 "." exp2)) + (exp3 ("def" insts "end") ("begin" insts-rescue-insts "end") ("do" insts "end") ("class" insts "end") ("module" insts "end") @@ -380,7 +389,7 @@ (ielsei (itheni) (itheni "else" insts)) (if-body (ielsei) (if-body "elsif" if-body))) '((nonassoc "in") (assoc ";") (right " @ ") - (assoc ",") (right "=") (assoc ".")) + (assoc ",") (right "=")) '((assoc "when")) '((assoc "elsif")) '((assoc "rescue" "ensure")) @@ -399,7 +408,8 @@ (nonassoc ">" ">=" "<" "<=") (nonassoc "==" "===" "!=") (nonassoc "=~" "!~") - (left "<<" ">>")))))) + (left "<<" ">>") + (right ".")))))) (defun ruby-smie--bosp () (save-excursion (skip-chars-backward " \t") @@ -609,7 +619,18 @@ ;; When after `.', let's always de-indent, ;; because when `.' is inside the line, the ;; additional indentation from it looks out of place. - ((smie-rule-parent-p ".") (smie-rule-parent (- ruby-indent-level))) + ((smie-rule-parent-p ".") + (let (smie--parent) + (save-excursion + ;; Traverse up the parents until the parent is "." at + ;; indentation, or any other token. + (while (and (progn + (goto-char (1- (cadr (smie-indent--parent)))) + (not (ruby-smie--bosp))) + (progn + (setq smie--parent nil) + (smie-rule-parent-p ".")))) + (smie-rule-parent)))) (t (smie-rule-parent)))))) (`(:after . ,(or `"(" "[" "{")) ;; FIXME: Shouldn't this be the default behavior of @@ -622,7 +643,10 @@ (unless (or (eolp) (forward-comment 1)) (cons 'column (current-column))))) (`(:before . "do") (ruby-smie--indent-to-stmt)) - (`(:before . ".") ruby-indent-level) + (`(:before . ".") + (if (smie-rule-sibling-p) + (and ruby-align-chained-calls 0) + ruby-indent-level)) (`(:after . "=>") ruby-indent-level) (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) (smie-rule-parent)) === modified file 'test/ChangeLog' --- test/ChangeLog 2014-01-27 19:10:02 +0000 +++ test/ChangeLog 2014-01-31 17:13:49 +0000 @@ -1,3 +1,8 @@ +2014-01-31 Dmitry Gutov + + * automated/ruby-mode-tests.el (ruby-align-chained-calls): + New test. + 2014-01-27 Michael Albinus * automated/file-notify-tests.el (file-notify--deftest-remote): === modified file 'test/automated/ruby-mode-tests.el' --- test/automated/ruby-mode-tests.el 2014-01-01 07:43:34 +0000 +++ test/automated/ruby-mode-tests.el 2014-01-31 17:13:49 +0000 @@ -333,6 +333,20 @@ | 42 | end"))) +(ert-deftest ruby-align-chained-calls () + (let ((ruby-align-chained-calls t)) + (ruby-should-indent-buffer + "one.two.three + | .four + | + |my_array.select { |str| str.size > 5 } + | .map { |str| str.downcase }" + "one.two.three + | .four + | + |my_array.select { |str| str.size > 5 } + | .map { |str| str.downcase }"))) + (ert-deftest ruby-move-to-block-stops-at-indentation () (ruby-with-temp-buffer "def f\nend" (beginning-of-line) === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2014-01-17 03:15:02 +0000 +++ test/indent/ruby.rb 2014-01-31 17:13:49 +0000 @@ -257,8 +257,8 @@ bar foo_bar_tee(1, 2, 3) - .qux - .bar + .qux.bar + .tee foo do bar @@ -338,7 +338,7 @@ %^abc^ ddd -qux = foo ? +qux = foo.fee ? bar : tee @@ -348,7 +348,7 @@ zoo .lose( - q, p) + q, p) foo(bar: tee) ------------------------------------------------------------ revno: 116222 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2014-01-31 10:13:28 +0000 message: lisp/gnus/nnimap.el (nnimap-transform-headers): Partially revert mistakenly checked-in test code from last checkin diff: === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2014-01-31 08:33:13 +0000 +++ lisp/gnus/nnimap.el 2014-01-31 10:13:28 +0000 @@ -216,7 +216,7 @@ ;; Start of the header section. (or (re-search-forward "] {[0-9]+}\r?\n" nil t) ;; Start of the next FETCH. - (re-search-forward "\\* [0-9]+ \\(UID \\)? FETCH" nil t) + (re-search-forward "\\* [0-9]+ FETCH" nil t) (point-max))) t) (setq size (string-to-number (match-string 1))) ------------------------------------------------------------ revno: 116221 committer: Juri Linkov branch nick: trunk timestamp: Fri 2014-01-31 11:41:54 +0200 message: Misc small fixes. * doc/lispref/searching.texi (String Search): Incremental word search fixes. * lisp/sort.el (delete-duplicate-lines): Remove `:weakness 'key' from `make-hash-table'. * lisp/textmodes/ispell.el (ispell-init-process): Change message format to be consistent with other messages. diff: === modified file 'doc/emacs/basic.texi' --- doc/emacs/basic.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/basic.texi 2014-01-31 09:41:54 +0000 @@ -235,7 +235,7 @@ @kindex C-LEFT @kindex M-LEFT @findex left-word -This command (@code{left-word}) behaves like @kbd{M-f}, except it +This command (@code{left-word}) behaves like @kbd{M-b}, except it moves @emph{forward} by one word if the current paragraph is right-to-left. @xref{Bidirectional Editing}. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-01-28 01:49:02 +0000 +++ doc/lispref/ChangeLog 2014-01-31 09:41:54 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Juri Linkov + + * searching.texi (String Search): Incremental word search fixes. + 2014-01-28 Glenn Morris * text.texi (Indent Tabs): Update related to tab-stops. === modified file 'doc/lispref/searching.texi' --- doc/lispref/searching.texi 2014-01-01 07:43:34 +0000 +++ doc/lispref/searching.texi 2014-01-31 09:41:54 +0000 @@ -137,7 +137,7 @@ @group (word-search-forward "Please find the ball, boy.") - @result{} 36 + @result{} 39 ---------- Buffer: foo ---------- He said "Please! Find @@ -160,16 +160,17 @@ times. Point is positioned at the end of the last match. @findex word-search-regexp -Internal, @code{word-search-forward} and related functions use the +Internally, @code{word-search-forward} and related functions use the function @code{word-search-regexp} to convert @var{string} to a regular expression that ignores punctuation. @end deffn @deffn Command word-search-forward-lax string &optional limit noerror repeat This command is identical to @code{word-search-forward}, except that -the end of @var{string} need not match a word boundary, unless @var{string} ends -in whitespace. For instance, searching for @samp{ball boy} matches -@samp{ball boyee}, but does not match @samp{aball boy}. +the beginning or the end of @var{string} need not match a word +boundary, unless @var{string} begins or ends in whitespace. +For instance, searching for @samp{ball boy} matches @samp{ball boyee}, +but does not match @samp{balls boy}. @end deffn @deffn Command word-search-backward string &optional limit noerror repeat @@ -181,8 +182,8 @@ @deffn Command word-search-backward-lax string &optional limit noerror repeat This command is identical to @code{word-search-backward}, except that -the end of @var{string} need not match a word boundary, unless @var{string} ends -in whitespace. +the beginning or the end of @var{string} need not match a word +boundary, unless @var{string} begins or ends in whitespace. @end deffn @node Searching and Case === modified file 'etc/NEWS' --- etc/NEWS 2014-01-31 07:28:17 +0000 +++ etc/NEWS 2014-01-31 09:41:54 +0000 @@ -244,11 +244,11 @@ ** `emacs-bzr-version' has been renamed to `emacs-repository-version', and works for git too, if you fetch the repository notes. -** `read-regexp-defaults-function' defines a function to read regexps, -used by commands like `rgrep', `lgrep' `occur', `highlight-regexp', etc. -You can customize this to specify a function that provides a default -value from the regexp last history element, or from the symbol found -at point. +** `read-regexp-defaults-function' defines a function to provide default +values for reading regexps by commands like `rgrep', `lgrep' `occur', +`highlight-regexp', etc. You can customize this to specify a function +that provides a default value from the regexp last history element, +or from the symbol found at point. +++ ** New option `load-prefer-newer' affects how the `load' function chooses === modified file 'etc/grep.txt' --- etc/grep.txt 2014-01-01 07:43:34 +0000 +++ etc/grep.txt 2014-01-31 09:41:54 +0000 @@ -72,13 +72,18 @@ agrep -n "INFO tree" ../info/* ../info/dir: 6: File: dir Node: Top This is the top of the INFO tree +* bzr grep with Bazaar plugin [grep] + +bzr grep --color=always -in "org-element-map" +lisp/org/org.el:21047: (org-element-map + * git-grep with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig and `*.el diff=el' in .gitattributes -git grep -inH -p -e "org-element-map" -lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify) -lisp/org/org.el:21047: (org-element-map +git --no-pager grep -inH -p -e "org-element-map" +lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify) +lisp/org/org.el:21047: (org-element-map * unknown greps === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-31 07:28:17 +0000 +++ lisp/ChangeLog 2014-01-31 09:41:54 +0000 @@ -1,3 +1,11 @@ +2014-01-31 Juri Linkov + + * sort.el (delete-duplicate-lines): Remove `:weakness 'key' + from `make-hash-table'. + + * textmodes/ispell.el (ispell-init-process): Change message format + to be consistent with other messages. + 2014-01-31 Glenn Morris * delsel.el (delete-selection-mode): Doc fix. === modified file 'lisp/sort.el' --- lisp/sort.el 2014-01-26 01:10:18 +0000 +++ lisp/sort.el 2014-01-31 09:41:54 +0000 @@ -595,7 +595,7 @@ (equal current-prefix-arg '(16)) (equal current-prefix-arg '(64)) t))) - (let ((lines (unless adjacent (make-hash-table :weakness 'key :test 'equal))) + (let ((lines (unless adjacent (make-hash-table :test 'equal))) line prev-line (count 0) (beg (copy-marker beg)) === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2014-01-14 10:50:28 +0000 +++ lisp/textmodes/ispell.el 2014-01-31 09:41:54 +0000 @@ -3025,7 +3025,7 @@ (setq ispell-filter nil ispell-filter-continue nil) ;; may need to restart to select new personal dictionary. (ispell-kill-ispell t) - (message "Starting new Ispell process [%s::%s] ..." + (message "Starting new Ispell process %s with %s dictionary..." ispell-program-name (or ispell-local-dictionary ispell-dictionary "default")) (sit-for 0) === modified file 'src/callint.c' --- src/callint.c 2014-01-01 07:43:34 +0000 +++ src/callint.c 2014-01-31 09:41:54 +0000 @@ -308,7 +308,7 @@ specs = Qnil; string = 0; - /* The idea of FILTER_SPECS is to provide away to + /* The idea of FILTER_SPECS is to provide a way to specify how to represent the arguments in command history. The feature is not fully implemented. */ filter_specs = Qnil; === modified file 'src/data.c' --- src/data.c 2014-01-26 19:44:23 +0000 +++ src/data.c 2014-01-31 09:41:54 +0000 @@ -2365,7 +2365,7 @@ DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0, doc: /* Return t if each arg is greater than or equal to the next arg. All must be numbers or markers. -usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) +usage: (>= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) (ptrdiff_t nargs, Lisp_Object *args) { return arithcompare_driver (nargs, args, ARITH_GRTR_OR_EQUAL); ------------------------------------------------------------ revno: 116220 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2014-01-31 08:33:13 +0000 message: lisp/gnus/nnimap.el (nnimap-transform-headers): Fix Davmail header parsing diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-01-31 01:56:00 +0000 +++ lisp/gnus/ChangeLog 2014-01-31 08:33:13 +0000 @@ -1,3 +1,7 @@ +2014-01-31 Lars Ingebrigtsen + + * nnimap.el (nnimap-transform-headers): Fix Davmail header parsing. + 2014-01-31 Dave Abrahams * gnus-salt.el (gnus-tree-highlight-article): Don't move point around === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2014-01-01 07:43:34 +0000 +++ lisp/gnus/nnimap.el 2014-01-31 08:33:13 +0000 @@ -216,7 +216,7 @@ ;; Start of the header section. (or (re-search-forward "] {[0-9]+}\r?\n" nil t) ;; Start of the next FETCH. - (re-search-forward "\\* [0-9]+ FETCH" nil t) + (re-search-forward "\\* [0-9]+ \\(UID \\)? FETCH" nil t) (point-max))) t) (setq size (string-to-number (match-string 1))) @@ -255,7 +255,9 @@ (insert (format "Chars: %s\n" size))) (when lines (insert (format "Lines: %s\n" lines))) - (unless (re-search-forward "^\r$" nil t) + ;; Most servers have a blank line after the headers, but + ;; Davmail doesn't. + (unless (re-search-forward "^\r$\\|^)\r?$" nil t) (goto-char (point-max))) (delete-region (line-beginning-position) (line-end-position)) (insert ".")