commit 0bec5a22cea517a15cf7eb5674094b94d1a7ead8 (HEAD, refs/remotes/origin/master) Author: Nikolaus Rath Date: Thu Jul 9 03:54:03 2015 +0000 nnimap.el: Handle plain value for nnimap-stream * lisp/gnus/nnimap.el (nnimap-open-connection-1): Always query capabilities, so that a 'plain value for the `nnimap-stream' server variable is handled correctly. * doc/misc/gnus.texi (Customizing the IMAP Connection): Document the 'plain option. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index d801031..0afc7e4 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -14252,6 +14252,10 @@ If you need to tunnel via other systems to connect to the server, you can use this option, and customize @code{nnimap-shell-program} to be what you need. +@item plain +Non-encrypted and unsafe straight socket connection. +@acronym{STARTTLS} will not be used even if it is available. + @end table @item nnimap-authenticator diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 40610e1..8eb6268 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -423,6 +423,7 @@ textual parts.") :return-list t :shell-command nnimap-shell-program :capability-command "1 CAPABILITY\r\n" + :always-query-capabilities t :end-of-command "\r\n" :success " OK " :starttls-function commit 7a94f28a470d640eda3f36016f4fc8946aac63be Author: Leo Liu Date: Thu Jul 9 10:18:00 2015 +0800 Fix bug in thing-at-point--bounds-of-well-formed-url * lisp/thingatpt.el (thing-at-point--bounds-of-well-formed-url): Make sure boundary contains current point. diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index c26b9be..84ffcca 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -361,7 +361,7 @@ the bounds of a possible ill-formed URI (one lacking a scheme)." (if found (cons (match-beginning 1) (match-end 1)))))) -(defun thing-at-point--bounds-of-well-formed-url (beg end _pt) +(defun thing-at-point--bounds-of-well-formed-url (beg end pt) (save-excursion (goto-char beg) (let (url-beg paren-end regexp) @@ -388,7 +388,11 @@ the bounds of a possible ill-formed URI (one lacking a scheme)." (scan-lists (1- url-beg) 1 0)))) (not (blink-matching-check-mismatch (1- url-beg) paren-end)) (setq end (1- paren-end))) - (cons url-beg end))))) + ;; Ensure PT is actually within BOUNDARY. Check the following + ;; example with point on the beginning of the line: + ;; + ;; 3,1406710489,http://gnu.org,0,"0" + (and (<= url-beg pt end) (cons url-beg end)))))) (put 'url 'thing-at-point 'thing-at-point-url-at-point) commit 15fafa34d0f2d3491d27c6b6d6b6310424eadb14 Author: Dmitry Gutov Date: Thu Jul 9 05:15:50 2015 +0300 * lisp/progmodes/xref.el (xref-collect-matches): Use `nreverse' in the end. diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index 50d52d0..78094ab 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -767,7 +767,8 @@ tools are used, and when." hits)))) (unwind-protect (delq nil - (mapcar (lambda (hit) (xref--collect-match hit regexp)) hits)) + (mapcar (lambda (hit) (xref--collect-match hit regexp)) + (nreverse hits))) (mapc #'kill-buffer (cl-set-difference (buffer-list) orig-buffers))))) commit 1f731f9280323272ffe9029071c95b36bb02b7c7 Author: Dmitry Gutov Date: Thu Jul 9 01:38:29 2015 +0300 Declare whitespace-line-column a safe file-local * lisp/whitespace.el (whitespace-line-column): Declare to be a safe file-local when the value is an integer. diff --git a/lisp/whitespace.el b/lisp/whitespace.el index fad3e2f..a1a6c3c 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -884,6 +884,7 @@ Used when `whitespace-style' includes `lines' or `lines-tail'." :type '(choice :tag "Line Length Limit" (integer :tag "Line Length") (const :tag "Use fill-column" nil)) + :safe 'integerp :group 'whitespace) commit 822d9eb1f96265c116d2d12b72deb9aa1a44e63c Author: Eric Abrahamsen Date: Wed Jul 8 22:28:50 2015 +0000 gnus-group.el: Check if group names are already strings * lisp/gnus/gnus-group.el (gnus-group-group-name): The group name may already be a string. Specifically, in the group list reached from the *Server* buffer, the 'gnus-group text property returns a string. Everywhere else it returns a symbol. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index dbeada2..c6cc38f 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1814,7 +1814,9 @@ already. If INFO-UNCHANGED is non-nil, dribble buffer is not updated." "Get the name of the newsgroup on the current line." (let ((group (get-text-property (point-at-bol) 'gnus-group))) (when group - (symbol-name group)))) + (if (stringp group) + group + (symbol-name group))))) (defun gnus-group-group-level () "Get the level of the newsgroup on the current line." commit adef5b0df4f8d52fd61a49cad8b47e12b0e04461 Author: Eric Abrahamsen Date: Wed Jul 8 22:28:24 2015 +0000 nnimap.el: Remove unused let variables * lisp/gnus/nnimap.el (nnimap-request-group): Variables are not used. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 208fd07..40610e1 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -803,7 +803,7 @@ textual parts.") nil group) server)) - articles active marks high low) + active) (with-current-buffer nntp-server-buffer (when result (when (or (not dont-check) commit cd2e23e06f503ec6d7240ddd5e8ff8e315cd1536 Author: Eli Zaretskii Date: Wed Jul 8 19:16:49 2015 +0300 Support "maximized" property of runemacs's shortcut * nt/runemacs.c (WinMain): If runemacs is invoked "maximized", pass the '--maximized' switch to Emacs. diff --git a/nt/runemacs.c b/nt/runemacs.c index 905ef30..86644b4 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -59,7 +59,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) char *new_cmdline; char *p; char modname[MAX_PATH]; - static const char iconic_opt[] = "--iconic "; + static const char iconic_opt[] = "--iconic ", maximized_opt[] = "--maximized "; if (!ensure_unicows_dll ()) goto error; @@ -74,7 +74,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) new_cmdline = alloca (MAX_PATH + strlen (cmdline) - + (nShow == SW_SHOWMINNOACTIVE) * strlen (iconic_opt) + + ((nShow == SW_SHOWMINNOACTIVE + || nShow == SW_SHOWMAXIMIZED) + ? max (sizeof (iconic_opt), sizeof (maximized_opt)) + : 0) + 3); /* Quote executable name in case of spaces in the path. */ *new_cmdline = '"'; @@ -146,9 +149,12 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) /* If the desktop shortcut properties tell to invoke runemacs minimized, or if they invoked runemacs via "start /min", pass - '--iconic' to Emacs, as that's what users will expect. */ + '--iconic' to Emacs, as that's what users will expect. Likewise + with invoking runemacs maximized: pass '--maximized' to Emacs. */ if (nShow == SW_SHOWMINNOACTIVE) strcat (new_cmdline, iconic_opt); + else if (nShow == SW_SHOWMAXIMIZED) + strcat (new_cmdline, maximized_opt); strcat (new_cmdline, cmdline); /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */ commit b953882a75068e079a99cfc86a5c0e9796d604bd Author: Eli Zaretskii Date: Wed Jul 8 17:22:15 2015 +0300 Support "minimized" property of runemacs's shortcut * nt/runemacs.c (WinMain): If runemacs is invoked "minimized", pass the '--iconic' switch to Emacs. (Bug#20991) diff --git a/nt/runemacs.c b/nt/runemacs.c index 3fcf405..905ef30 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -59,6 +59,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) char *new_cmdline; char *p; char modname[MAX_PATH]; + static const char iconic_opt[] = "--iconic "; if (!ensure_unicows_dll ()) goto error; @@ -71,7 +72,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) goto error; *p = 0; - new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3); + new_cmdline = alloca (MAX_PATH + + strlen (cmdline) + + (nShow == SW_SHOWMINNOACTIVE) * strlen (iconic_opt) + + 3); /* Quote executable name in case of spaces in the path. */ *new_cmdline = '"'; strcpy (new_cmdline + 1, modname); @@ -140,6 +144,11 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) while (*++cmdline == ' '); } + /* If the desktop shortcut properties tell to invoke runemacs + minimized, or if they invoked runemacs via "start /min", pass + '--iconic' to Emacs, as that's what users will expect. */ + if (nShow == SW_SHOWMINNOACTIVE) + strcat (new_cmdline, iconic_opt); strcat (new_cmdline, cmdline); /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin". */ commit 7da7a9774cbb4d8991bd002c1c31bf49b27fb521 Author: Xue Fuqiao Date: Wed Jul 8 19:17:38 2015 +0800 Doc fixes * doc/emacs/files.texi (Diff Mode): Fix the description of `C-c C-w' in Diff mode. * doc/emacs/arevert-xtra.texi (Auto Reverting the Buffer Menu): Add a cross reference. ; * doc/emacs/search.texi (Regexp Backslash): Minor fix. diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index 32b5463..9d35610 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -47,9 +47,10 @@ explained in the corresponding sections. @subsection Auto Reverting the Buffer Menu If auto-reverting of non-file buffers is enabled, the Buffer Menu -automatically reverts every @code{auto-revert-interval} seconds, -whether there is a need for it or not. (It would probably take longer -to check whether there is a need than to actually revert.) +(@pxref{Several Buffers}) automatically reverts every +@code{auto-revert-interval} seconds, whether there is a need for it or +not. (It would probably take longer to check whether there is a need +than to actually revert.) If the Buffer Menu inappropriately gets marked modified, just revert it manually using @kbd{g} and auto-reverting will resume. However, if diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 3a281d2..e5c5e1b 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1476,9 +1476,9 @@ unified format to context format. When the mark is active, convert only the text within the region. @item C-c C-w -@findex diff-refine-hunk -Refine the current hunk so that it disregards changes in whitespace -(@code{diff-refine-hunk}). +@findex diff-ignore-whitespace-hunk +Re-diff the current hunk, disregarding changes in whitespace +(@code{diff-ignore-whitespace-hunk}). @item C-x 4 A @findex diff-add-change-log-entries-other-window diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index 9c3f36a..0888f8a 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -78,6 +78,7 @@ the undo command. previous undo commands, use @kbd{M-x undo-only}. This is like @code{undo}, but will not redo changes you have just undone. +@c What about @kbd{M-x revert-buffer}? --xfq If you notice that a buffer has been modified accidentally, the easiest way to recover is to type @kbd{C-/} repeatedly until the stars disappear from the front of the mode line (@pxref{Mode Line}). diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 247033d..3562f8a 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -898,10 +898,10 @@ a conflict, you can use a ``shy'' group. @item \(?: @dots{} \) @cindex shy group, in regexp specifies a ``shy'' group that does not record the matched substring; -you can't refer back to it with @samp{\@var{d}}. This is useful -in mechanically combining regular expressions, so that you -can add groups for syntactic purposes without interfering with -the numbering of the groups that are meant to be referred to. +you can't refer back to it with @samp{\@var{d}} (see below). This is +useful in mechanically combining regular expressions, so that you can +add groups for syntactic purposes without interfering with the +numbering of the groups that are meant to be referred to. @item \@var{d} @cindex back reference, in regexp commit 7aea6aa63e68cf7bff4bbfa0713b6db209050e36 Author: Dmitry Gutov Date: Wed Jul 8 13:57:15 2015 +0300 ; Fix a typo diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index bf18adf..411416b 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -2045,7 +2045,7 @@ This respects the wrapper hook `completion-in-region-functions'." (defvar completion-at-point-functions '(tags-completion-at-point-function) "Special hook to find the completion table for the thing at point. -Each function on this hook is called in turns without any argument and should +Each function on this hook is called in turn without any argument and should return either nil to mean that it is not applicable at point, or a function of no argument to perform completion (discouraged), or a list of the form (START END COLLECTION . PROPS) where