From: Paul Eggert Date: Mon, 23 Mar 2015 17:30:33 +0000 (-0700) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2564^2~91 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/2393085c9ac30ac7378a39ee77760dfdecd4b509 Merge from origin/emacs-24 ad89f85 Another minor improvement in ELisp manual (Bug#20168) 5e2951b Improve docs of 'posn-actual-col-row' (Bug#20169) 1291ce1 Minor documentation fix in ELisp manual (Bug#20174) 33e2236 * display.texi (Useless Whitespace): Fix thinko. ff3878d * configure.ac: Fix jpeg version check to work with gcc >= 5. 90b46f5 Work for the case nnmail-expiry-target is an nnmh group (bug#20170) e7f92aa authors.el small additions 0bfe915 * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters. c3c4b75 Fixes: debbugs:18939 Conflicts: ChangeLog doc/lispref/ChangeLog etc/PROBLEMS lisp/ChangeLog lisp/gnus/ChangeLog lisp/simple.el --- 2393085c9ac30ac7378a39ee77760dfdecd4b509 diff --cc ChangeLog index c155708f1f,b578d0867b..a489ab9f9d --- a/ChangeLog +++ b/ChangeLog @@@ -1,103 -1,8 +1,107 @@@ + 2015-03-23 Andreas Schwab + + * configure.ac: Fix jpeg version check to work with gcc >= 5. + -2015-01-20 Eli Zaretskii +2015-03-21 Samer Masterson + + * CONTRIBUTE (Test your changes.): New section. + (Document your changes.): Add doc tips. + +2015-03-19 Paul Eggert + + Better port of pthread usage to FreeBSD + * configure.ac (ac_func_list): Omit pthread_sigmask, since + we check for that ourselves rather than relying on gnulib. + (HAVE_PTHREAD, LIB_PTHREAD): Port better to FreeBSD, + by also checking for pthread_create, pthread_self, pthread_sigmask. + Tighten the test for pthread_atfork while we're at it. + Fixes: bug#20136 + + Merge from gnulib + This incorporates: + 2015-03-19 fdopendir: port better to MinGW + 2015-03-18 fdopendir: fix typo in comment + 2015-02-24 glob, etc.: port to MSVC v18 on MS-Windows 8.1 + * lib/dirent.in.h, lib/fdopendir.c: Update from gnulib. + * lib/dirfd.c, m4/dirfd.m4: New files from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + +2015-03-02 Robert Pluim (tiny change) + + * configure.ac: Error out if with-file-notification=w32 is + specified on Cygwin. (Bug#19909) + +2015-02-27 Paul Eggert + + Don't require GNU putenv + * configure.ac: Use system putenv even if it lacks GNU features, as + we don't need them. This works around a bug in FreeBSD 10.1 getenv. + Fixes: bug#19874 + +2015-02-25 Paul Eggert + + Merge from gnulib + * lib/getdtablesize.c, m4/dup2.m4, m4/fcntl.m4: + Update from gnulib, incorporating: + 2015-02-23 dup2: doc and test for Android bug + 2015-02-23 Replace dup2() on Android + 2015-02-22 Android doesn't define RLIM_SAVED_* + +2015-02-21 Paul Eggert + + Merge from gnulib + * lib/getdtablesize.c, lib/getopt.c, lib/signal.in.h, lib/tempname.c: + * lib/tempname.h, m4/dup2.m4, m4/fcntl.m4, m4/getdtablesize.m4: + Update from gnulib, incorporating: + 2015-02-20 getdtablesize: port better for Android + 2015-02-19 fcntl: Fix cross compiling + 2015-02-18 dup2, fcntl: cross-compile better for Android + 2015-02-18 getopt: don't crash on memory exhaustion + 2015-02-17 tempname: allow compilation with C++ (trivial) + 2015-02-17 dup2, fcntl: port to AIX + 2015-02-16 getdtablesize, dup2, fcntl: port to Android + 2015-02-11 getdtablesize, signal_h: Fix Android build + 2015-02-11 maint: various whitespace cleanups in tempname + +2015-02-13 Jan Djärv + + * configure.ac: Set locallisppath to empty for NS self contained, + unless --enable-loadllisppath was given (Bug#19850). + +2015-02-09 Paul Eggert + + * configure.ac (HAVE_LIBXML2): Add missing comma. + +2015-02-08 Paul Eggert + + Port to platforms lacking test -a and -o + * configure.ac (HAVE_LIBXML2): + Prefer '&&' and '||' to 'test -a' and 'test -o'. + +2015-02-08 Ulrich Müller + + * configure.ac (--with-gameuser): Default to 'games' group instead + of 'games' user. + +2015-02-04 Paul Eggert + + * .gitattributes: Ignore blanks at EOL in texinfo.tex. + +2015-01-28 Paul Eggert + + Merge from gnulib and try to repair bad merge + This attempts to repair problems introduced by the bad merge + 5491fd1098d27b3ba3db054076b9ab60fb3558dc. The easiest way for me + to fix the badly-merged gnulib files was to run + 'admin/merge-gnulib', so I did that, which also imported the + following changes: + * build-aux/update-copyright, m4/gnulib.m4: + Update from gnulib, incorporating: + 2015-01-15 time: port to MinGW32 3.21 + 2015-01-15 update-copyright: apply to self + 2015-01-11 update-copyright: recognize groff's \(co marker + +2015-01-28 Eli Zaretskii * configure.ac (HAVE_W32): Abort with error message if --without-toolkit-scroll-bars was specified. See diff --cc doc/lispref/ChangeLog index ff1f8148e8,a0a2b2b4d0..a546306f9e --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,8 -1,12 +1,16 @@@ + 2015-03-23 Eli Zaretskii + + * commands.texi (Event Input Misc): Fix incorrect usage of @code. + (Bug#20174) + (Accessing Mouse): Expand documentation of 'posn-actual-col-row'. + (Bug#20169) + More accurate description of 'posn-object-x-y'. (Bug#20168) + -2015-03-14 Eli Zaretskii +2015-03-23 Daiki Ueno + + * processes.texi (Asynchronous Processes): Mention `make-process'. + +2015-03-18 Eli Zaretskii * minibuf.texi (Basic Completion): Fix a typo. (Bug#20108) diff --cc lisp/ChangeLog index 712bd73dba,40f1e9ff27..248f24d649 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,14 +1,14 @@@ + 2015-03-23 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases) + (authors-obsolete-files-regexps): Additions. + -2015-03-22 Jan Djärv ++2015-03-23 Jan Djärv + + * simple.el (deactivate-mark): Only modify PRIMARY if we own + PRIMARY (Bug#18939). + -2015-03-22 Martin Rudalics +2015-03-23 Martin Rudalics * emacs-lisp/debug.el (debug): Don't try using "previous" window when its not live or on an invisible frame (Bug#17170). diff --cc lisp/gnus/ChangeLog index 762e3e7e0d,1c8dff615d..4903796a7f --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@@ -1,192 -1,10 +1,197 @@@ + 2015-03-23 Ben Bacarisse (tiny change) + + * nnmh.el (nnmh-request-expire-articles): + Work for the case nnmail-expiry-target is an nnmh group (bug#20170). + +2015-03-21 Eric Abrahamsen + + * registry.el (registry-lookup-secondary, registry-full) + (registry-prune, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-load): Use slot names rather than + initarg names in `oref' and `oset'. + +2015-03-19 Eric Abrahamsen + + * registry.el (registry-prune): Allow registry to reach full size + before pruning. + +2015-03-19 Eric Abrahamsen + + * registry.el (registry-collect-prune-candidates): Fix call to + cl-subseq. + +2015-03-11 Stefan Monnier + + * gnus-registry.el (gnus-registry-handle-action) + (gnus-registry-post-process-groups): Don't add-to-list on a local var. + (gnus-registry-keywords): Make it do something. + (gnus-registry-import-eld): Remove unused var `new-entry'. + (gnus-registry-action): Remove unused var `to-name'. + (gnus-registry-make-db): Prefer `make-instance' to avoid + compiler warnings. + (gnus-registry-load, gnus-registry-fixup-registry): Avoid `oset'. + + * registry.el (registry-db): Don't oset-default an instance-allocated + slot. + +2015-03-10 Glenn Morris + + * message.el (message-valid-fqdn-regexp): Bump :version for + 2014-11-17 change. + +2015-03-08 Rasmus Pank Roulund + + * gnus-notifications.el (gnus-notifications-action): Raise window + frame. + (gnus-notifications-action): Allow mark as read. + (gnus-notifications-notify): Show uption to mark as read. + +2015-03-08 Adam Sjøgren + + * message.el (message-insert-formatted-citation-line): Change %F to + fall back to email address if no first name could be determined. + +2015-03-07 Stefan Monnier + + * registry.el (registry-lookup-breaks-before-lexbind, registry-lookup) + (registry-search, registry-delete, registry-size, registry-insert) + (registry-reindex, registry-collect-prune-candidates): + * gnus-registry.el (gnus-registry-fixup-registry) + (gnus-registry-remove-extra-data): Use slot names rather than initarg + names in `oref' and `oset'. + +2015-02-26 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part): + Fix point motion when removing displayed MIME part. + (gnus-article-edit-part): Make jumping to the next part really work + when deleting or stripping. + (gnus-mime-buttonize-attachments-in-header): Make header attachment + buttons identical to the ones in the article body so as to work deleting + and stripping. + +2015-02-25 Katsumi Yamaoka + + * mm-decode.el (mm-shr) + * mm-view.el (mm-inline-text-html-render-with-w3m): + Revert my bogus change that made the start marker of a part + the "moves after insertion" type. + +2015-02-23 Tassilo Horn + + * mailcap.el (mailcap-mime-data): Support `pdf-view-mode' (from PDF + Tools: https://github.com/politza/pdf-tools) for viewing PDF + attachments in emacs. + +2015-02-23 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error. + +2015-02-18 Eric Abrahamsen + + * nnimap.el (nnimap-get-groups): Correctly read unquoted group names + from the server LIST response. + +2015-02-14 Lars Ingebrigtsen + + * nnimap.el (nnimap-retrieve-headers): If the server closes connection + during header retrieval, error out instead of interpreting the data in + the buffer as the only messages there. This way, we don't mark + articles as read on a server hangup (bug#19035). + + * mm-decode.el (mm-head-p): New function. + (mm-display-part): Go to a blank line when inserting parts internally. + +2015-02-13 Lars Ingebrigtsen + + * gnus-msg.el (gnus-msg-mail): Don't let-bind `gnus-newsgroup-name' so + that we don't get a warning when setting the buffer-local variable + (bug#19573). + + * nnmail.el (nnmail-expiry-target-group): Supply the info structure to + `gnus-request-group'. + +2015-02-12 Katsumi Yamaoka + + * gnus-art.el (gnus-article-browse-html-save-cid-content) + (gnus-article-browse-html-parts): Make cid file names relative if and + only if html doesn't specify directory. + +2015-02-11 Lars Ingebrigtsen + + * gnus-art.el (gnus-treat-buttonize): Don't re-buttonize URLs in HTML + parts, because that breaks filling (since buttons are in a bold face). + +2015-02-10 Katsumi Yamaoka + + * mm-decode.el (mm-convert-shr-links): Delete useless variable `face'; + use gnus-overlays-at and gnus-overlay-put. + +2015-02-10 Lars Ingebrigtsen + + * mm-decode.el (mm-shr): Only pass the fill column when not using + fonts, because limiting the width to what's appropriate for followups + doesn't really help when not using proportional fonts. + +2015-02-09 Lars Ingebrigtsen + + * mm-decode.el (mm-convert-shr-links): Don't overwrite the faces from + shr, beacause that breaks folding. + (mm-shr): Don't shorten the width when using fonts. + +2015-02-05 Teodor Zlatanov + + * gnus-start.el (gnus-save-newsrc-file-check-timestamp): Remove + variable; always check the newrc timestamp. + (gnus-save-newsrc-file): Always check timestamp. + +2015-02-05 Timo Lilja (tiny change) + + * mail-source.el (mail-source-call-script): If scripts exit with an + error, pop up an error buffer. + +2015-02-05 Lars Ingebrigtsen + + * gnus-sum.el (gnus-extra-headers): Add the popular Gmail X-GM-LABELS + as a default. + + * nnimap.el (nnimap-request-group-scan): Ensure that we've selected the + correct server. + +2015-02-05 Vincent Bernat (tiny change) + + * nnimap.el (nnimap-request-group-scan): Fix the function name. + + * gnus-int.el (gnus-request-group-scan): Use the correct function name. + +2015-02-05 Lars Ingebrigtsen + + * gnus-sum.el (gnus-select-newsgroup): Pass the group info along so + that nnimap works for non-activated backends. + +2015-02-04 Stefan Monnier + + * mm-util.el (mm-with-unibyte-current-buffer): Don't emit a warning + message, since we already get an obsolescence message. Use `declare'. + +2015-02-04 Eric Abrahamsen + + * nnir.el: Revert "Enable non-ASCII IMAP searches". + +2015-01-30 Glenn Morris + + * gnus-registry.el (gnus-registry-max-pruned-entries) + (gnus-registry-prune-factor, gnus-registry-default-sort-function): + Fix :version. + (gnus-registry-default-sort-function): Improve :type. + 2015-01-29 Lars Ingebrigtsen + * nnimap.el (nnimap-request-group): Allow running this function on + groups that don't exist in Gnus yet. + (nnimap-request-group): Revert previous patch since that made it + impossible to enter nnimap groups. + * message.el (message-smtpmail-send-it): Remove the mail header separator before sending. diff --cc lisp/simple.el index f7f35564f3,5e5cd877e9..5185607043 --- a/lisp/simple.el +++ b/lisp/simple.el @@@ -4807,7 -4420,8 +4807,8 @@@ run `deactivate-mark-hook'. ;; the region prior to the last command modifying the buffer. ;; Set the selection to that, or to the current region. (cond (saved-region-selection - (gui-set-selection 'PRIMARY saved-region-selection) - (if (x-selection-owner-p 'PRIMARY) - (x-set-selection 'PRIMARY saved-region-selection)) ++ (if (gui-call gui-selection-owner-p 'PRIMARY) ++ (gui-set-selection 'PRIMARY saved-region-selection)) (setq saved-region-selection nil)) ;; If another program has acquired the selection, region ;; deactivation should not clobber it (Bug#11772).