1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Commit Graph

126804 Commits

Author SHA1 Message Date
Thomas Fitzsimmons
9f17bf6e64 Fix display.texi typo
* doc/lispref/display.texi (Faces): Fix typo.
2016-08-12 22:33:11 -04:00
Paul Eggert
2dd8044bfb Fix process leak with make-network-process
This problem was introduced by the recent async changes (Bug#23808).
* src/process.c (Fmake_process): Move USE_SAFE_ALLOCA later,
so that it follows the start_process_unwind unwind-protect.
Set pid to -1 while the process is being created.
(start_process_unwind): Omit unnecessary emacs_abort test.
(connect_network_socket): Simplify use of counts.  Unwind
bind_polling_period a bit earlier, so that a remove_process
unwind-protect can be added when needed; this is the heart of
the fix.  Undo the unwind-protect just before returning.
2016-08-11 11:26:34 -07:00
Eli Zaretskii
2e0a2b376f Avoid annoying re-scroll when buffer has many overlay strings
* src/xdisp.c (redisplay_window): Add better recovery from a
situation where window-start is on buffer position which has a
before-string that includes newlines, with the result that point
is not visible in the window, because the display engine starts
displaying with the before-string.  (Bug#24179)
2016-08-11 18:04:42 +03:00
Paul Eggert
cd35240613 Omit unnecessary process initialization
* src/process.c (make_process, Fmake_process)
(Fmake_pipe_process, Fmake_serial_process)
(Fmake_network_process, server_accept_connection):
Omit unnecessary initialization of already-cleared storage.
2016-08-10 13:19:36 -07:00
Tino Calancha
76f3328199 cl-delete-duplicates: Parse :if to have cl-if bound
* lisp/emacs-lisp/cl-seq.el (cl--delete-duplicates):
We need also to parse keyword :if, otherwise cl-if
is unbound.
This reverts commit:
68fdbeb917
2016-08-10 23:23:18 +09:00
Tino Calancha
68fdbeb917 cl-delete-duplicates: do not parse :if keyword
* lisp/emacs-lisp/cl-seq.el (cl--delete-duplicates):
Parse only the supported keywords.
2016-08-10 22:34:21 +09:00
Michael Albinus
c2664aaab6 Add compatibility layer for `temporary-file-directory-function'
* lisp/net/tramp-compat.el
(tramp-compat-temporary-file-directory-function): New defalias.

* lisp/net/tramp.el (tramp-handle-make-nearby-temp-file): Use it.

* test/lisp/net/tramp-tests.el (tramp-test32-make-nearby-temp-file):
Skip for older Emacs versions.
2016-08-10 12:10:26 +02:00
Michael Albinus
5115743b67 * lisp/comint.el (comint-password-prompt-regexp): Add "PEM" for OpenVPN.
(Bug#24059)
2016-08-10 12:09:12 +02:00
Vincent Belaïche
538d5916c1 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2016-08-10 10:14:29 +02:00
Vincent Belaïche
bfeacfcdc9 Handle nil cell value in compiled printer functions.
* doc/misc/ses.texi (Quick Tutorial): Minor clarification about the
ses-range `!' modifier.
(More on cell printing): Fix this that the fallback printer is
`ses-prin1', not "%S".  That makes a difference for any cell value for
which "%S" would insert a backslash characters.

* lisp/ses.el (ses-local-printer-compile): Handle the nil cell value
--- contrary to emacs-25 branches ses-call-printer does not handle
prior to calling a function printer.  Not doing this would still work
because the compiled function would throw and error and SES would in
the end resort to the ses-prin1 fallback, however this way would not
be in line with the raison d'être of compiling printer which is speed.
2016-08-10 10:13:27 +02:00
Mark Oteiza
05dc6794f1 Turn on lexical-binding in json.el
Measuring with (benchmark-run 100 (json-read-file "foobar.json"))
showed 12-31% reduction in execution time.
* lisp/json.el: Turn on lexical-binding.
2016-08-10 00:42:40 -04:00
Mark Oteiza
4ffdcfc6d1 Nudge WoMan toward lexical-binding
* lisp/woman.el (woman-parse-man.conf, woman-manpath-add-locales):
Use cl-pushnew instead of add-to-list.
(woman-justify-list): Rename to woman-justify-styles.
(woman-justify-styles): New array.
(woman-justify, woman-decode-region, woman2-ad, woman2-na): Use it.
(woman-cached-data): Use cl-pushnew instead of add-to-list.
2016-08-10 00:15:55 -04:00
Vincent Belaïche
731d225cf3 Apply changes from commits 3c97b0f758 and 8a38e948b0 to master branch.
Here follows the logs from the two commits which I apply to master.

commit 3c97b0f758
Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date:   Fri Jul 29 13:44:14 2016 +0200

Fix ses-delete-blanks to delete only blanks + documentation.

* doc/misc/ses.texi (Quick Tutorial): Mention the '!'
'ses-range' modifier as an alternative to 'ses+'.
(Advanced Features): Add a refernce to node 'Nonrelocatable
references' concerning function 'ses-rename-cell'.
(Standard formula functions): Mention the '!' 'ses-range'
modifier as an alternative to 'ses-delete-blanks'.
(More on cell printing): Fix fallback printer
definition.  Minor editorial formatting changes.
(Nonrelocatable references): Document the use of
'ses-rename-cell' as a better way to make cell reference
non-relocatable.
(The data area): Document the presence of local printer
definitions in the data area.

* lisp/ses.el (ses-delete-blanks): Do not remove
*error*.  Any error in an argument should propagate into the
using formula rather than being silently hidden !

commit 8a38e948b0
Author: Vincent Belaïche <vincentb1@users.sourceforge.net>
Date:   Thu Jul 28 19:49:37 2016 +0200

Fix local printer set to left aligned string formatter.

* lisp/ses.el (ses-local-printer-compile): Add missing case
for left-aligned string formatter.
2016-08-09 23:46:13 +02:00
Paul Eggert
e13c5467fc * .dir-locals.el (c-noise-macro-names): Remove NONVOLATILE. 2016-08-09 11:51:16 -07:00
Stefan Monnier
c97cd6c005 * lisp/emacs-lisp/cconv.el: Fix λ-lifting in the presence of shadowing
Change the code which detects and circumvents the case where one of the
variables used in λ-lifting is shadowed, so that it also works when the
shadowing comes before the λ-lifted function (bug#24171).

(cconv--remap-llv): New function, extracted from cconv-convert.
(cconv-convert): Use it, but differently for `let' and `let*'.
2016-08-09 13:05:03 -04:00
Alan Mackenzie
9cf9095838 CC Mode: check for and fix missing call to before_change_functions.
Fixes bug #24094 and bug #24074.

This can happen with `revert-buffer' or sometimes `find-file', when the file
is already in a buffer, but the file has been changed outside of Emacs.

* lisp/progmodes/cc-mode (c-after-change): When we detect a missing
invocation of c-before-change-functions, we assume the changed region is the
entire buffer, and call c-before-change explicitly before proceding.
2016-08-09 16:09:18 +00:00
Alan Mackenzie
8b789c8cfe Make c-deprepertize-CPP work on deletion/insertion of "s. Fixes bug #24132.
* lisp/progmodes/cc-mode.el (c-depropertize-CPP): Rewrite function.
2016-08-09 10:23:31 +00:00
Michael Albinus
5126b7d6c2 Support $ENV in Tramp
* doc/misc/tramp.texi (Remote processes): Explain setting $ENV.

* etc/NEWS: Explain the "ENV" environment variable in
`tramp-remote-process-environment'.

* lisp/net/tramp-sh.el (tramp-remote-process-environment): Add "ENV=''".
(tramp-open-shell): Read $ENV value from
`tramp-remote-process-environment'.
(tramp-open-connection-setup-interactive-shell): Set values in
proper order.
2016-08-09 11:50:13 +02:00
Paul Eggert
e09dc1112b Simplify exec_byte_code via moving decls etc.
* src/bytecode.c (exec_byte_code): Simplify, mostly by moving
initializers into decls, and by omitting some unnecessary
changes to ‘top’.  This improves performance a bit on x86-64,
as it happens.
2016-08-09 01:31:23 -07:00
Paul Eggert
644fc17b9a Remove interpreter’s byte stack
This improves performance overall on my benchmark on x86-64,
since the interpreted program-counter resides in a machine
register rather than in RAM.
* etc/DEBUG, src/.gdbinit: Remove xbytecode GDB command, as there
is no longer a byte stack to decode.
* src/bytecode.c (struct byte_stack, byte_stack_list)
(relocate_byte_stack): Remove.  All uses removed.
(FETCH): Simplify now that pc is now local (typically, in a
register) and no longer needs to be relocated.
(CHECK_RANGE): Remove.  All uses now done inline, in a different way.
(BYTE_CODE_QUIT): Remove; now done by op_relative_branch.
(exec_byte_code): Allocate a copy of the function’s bytecode,
so that there is no problem if GC moves it.
* src/lisp.h (struct handler): Remove byte_stack member.
All uses removed.
(SAFE_ALLOCA_LISP_EXTRA): New macro, a generalization of
SAFE_ALLOCA_LISP.
(SAFE_ALLOCA_LISP): Use it.
2016-08-09 01:31:22 -07:00
Paul Eggert
cb71a119f7 Remove arbitrary limit on bytecode maxdepth
* src/bytecode.c (exec_byte_code): Remove MAX_ALLOCA-based limit
on bytecode maxdepth, by using SAFE_ALLOCA_LISP instead of alloca.

pipeline is fuller.
2016-08-09 01:31:22 -07:00
Paul Eggert
d896f78973 Tune bytecode quitting
* src/bytecode.c (BYTE_CODE_QUIT): Check for GC, too.  Do the
check only once every 256 times.  This should be good enough, and
improves performance significantly on x86-64 as branch-prediction
typically assumes checking will not be done so the instruction
pipeline stays fuller.
(exec_byte_code): Set up the quit counter.  Don’t call maybe_gc
directly, as BYTE_CODE_QUIT does that now.
2016-08-09 01:31:21 -07:00
Paul Eggert
4d07064a43 Simplify BYTE_CODE_SAFE checking
* src/bytecode.c (BYTE_CODE_SAFE): Default to false, so that it
can be used outside #if.  All uses of ‘defined BYTE_CODE_SAFE’
changed to ‘BYTE_CODE_SAFE’.  Use BYTE_CODE_SAFE in plain
expressions instead of #if expressions when this is easy.
(struct byte_stack) [BYTE_CODE_SAFE]: Remove member ‘bottom’,
as it is no longer needed.
(exec_byte_code): Omit #if BYTE_CODE_SAFE when this is easy.
Simplify stack-overflow checking when BYTE_CODE_SAFE.
2016-08-09 01:31:20 -07:00
Paul Eggert
846e88eb99 Get BYTE_CODE_METER working again
BYTE_CODE_METER hasn’t worked since 2013, and nobody seems to have
noticed.  Perhaps we should remove it?
* src/bytecode.c (METER_2) [BYTE_CODE_METER]:
Use *aref_addr instead of AREF, since it needs to be an lvalue.
2016-08-09 00:37:08 -07:00
Eli Zaretskii
9fc22fb932 Fix cursor position under scroll-conservatively and overlay strings
* src/xdisp.c (try_scrolling): Handle the case where the last
visible screen line of a window displays a before- or after-string
that takes up the whole screen line, and therefore there's no
place to display the cursor, even though the window does seem to
include the position of point.  (Bug#24179)
2016-08-08 18:15:55 +03:00
Michael Albinus
e2b7fe4e5a * lisp/files.el (file-ownership-preserved-p): Fix docstring. (Bug#23998) 2016-08-08 10:58:29 +02:00
Paul Eggert
7961dee182 Tune interpretation of integer arglist descriptor
* src/bytecode.c (exec_byte_code):
Simplify and tune when INTEGERP (args_template).
2016-08-07 10:02:03 -07:00
Noam Postavsky
7fb75680b3 Fix debugging of string-match-p errors
* src/eval.c (call_debugger): Bind inhibit-changing-match-data to nil so
that debugger code that needs to do regexp match won't break
(Bug #23949, Bug #24166, Bug#16294).
2016-08-07 10:24:40 -04:00
Michael Albinus
2c0506173d Add make-nearby-temp-file' and temporary-file-directory'
* doc/lispref/files.texi (Unique File Names):
Introduce `make-nearby-temp-file' and `temporary-file-directory'.
(Magic File Names): Mention `make-nearby-temp-file' and
`temporary-file-directory'.

* etc/NEWS (provided): Mention `make-nearby-temp-file' and
`temporary-file-directory'.

* lisp/files.el (mounted-file-systems): New defcustom.
(temporary-file-directory, make-nearby-temp-file): New defuns.
(normal-backup-enable-predicate): Fix docstring.

* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist):
* lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist):
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
<make-nearby-temp-file, temporary-file-directory>: Add handler.

* lisp/net/tramp.el (tramp-file-name-for-operation):
Add `make-nearby-temp-file' and `temporary-file-directory'.
(tramp-get-remote-tmpdir): Remove compatibility code.
(tramp-handle-temporary-file-directory)
(tramp-handle-make-nearby-temp-file): New defuns.

* lisp/org/ob-core.el (org-babel-local-file-name):
* lisp/progmodes/gud.el (gud-common-init):
* lisp/vc/vc-hooks.el (vc-user-login-name): Use `file-remote-p'.

* lisp/vc/vc-git.el (vc-git-checkin): Handle remote log message.

* test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name):
Check `tramp--test-enabled'.
(tramp-test18-file-attributes): Add tests for
`file-ownership-preserved-p'.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Reduce timeouts in `accept-process-output'.
(tramp-test--shell-command-to-string-asynchronously): Add timeout.
(tramp-test29-environment-variables): Remove additional sleep calls.
(tramp-test32-make-nearby-temp-file): New test.
(tramp--test-special-characters, tramp--test-utf8): Adapt docstring.
(tramp-test33-special-characters)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls, tramp-test34-utf8)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests)
(tramp-test36-recursive-load, tramp-test37-unload): Rename.
(tramp--test-ftp-p): Simplify check.
(tramp--test-sh-p): New defun.
(tramp-test20-file-modes, tramp-test22-file-times)
(tramp-test26-process-file, tramp-test27-start-file-process)
(tramp-test28-shell-command)
(tramp-test29-environment-variables)
(tramp-test30-vc-registered)
(tramp-test33-special-characters-with-stat)
(tramp-test33-special-characters-with-perl)
(tramp-test33-special-characters-with-ls)
(tramp-test34-utf8-with-stat, tramp-test34-utf8-with-perl)
(tramp-test34-utf8-with-ls)
(tramp-test35-asynchronous-requests): Use it.
2016-08-07 13:57:23 +02:00
Michael Albinus
a798547727 Add missing dcstrings in Tramp, remove chec for obsolee methods
* lisp/net/tramp.el (tramp-progress-reporter-update)
(tramp-unload-file-name-handlers, tramp-get-local-uid)
(tramp-get-local-gid, tramp-get-local-locale):
* lisp/net/tramp-adb.el (tramp-adb-ls-date-regexp)
(tramp-adb-ls-toolbox-regexp, tramp-adb-get-ls-command):
* lisp/net/tramp-compat.el (tramp-compat-funcall):
* lisp/net/tramp-ftp.el (tramp-ftp-enable-ange-ftp):
* lisp/net/tramp-gw.el (tramp-gw-process-filter):
* lisp/net/tramp-sh.el (tramp-get-remote-path)
(tramp-get-remote-locale, tramp-get-ls-command)
(tramp-get-ls-command-with-dired)
(tramp-get-ls-command-with-quoting-style)
(tramp-get-ls-command-with-w-option)
(tramp-get-test-nt-command, tramp-get-file-exists-command)
(tramp-get-remote-ln, tramp-get-remote-perl)
(tramp-get-remote-stat, tramp-get-remote-readlink)
(tramp-get-remote-trash, tramp-get-remote-touch)
(tramp-get-remote-gvfs-monitor-dir)
(tramp-get-remote-inotifywait, tramp-get-remote-id)
(tramp-get-remote-uid-with-id)
(tramp-get-remote-uid-with-perl, tramp-get-remote-python)
(tramp-get-remote-uid-with-python, tramp-get-remote-uid)
(tramp-get-remote-gid-with-id)
(tramp-get-remote-gid-with-perl)
(tramp-get-remote-gid-with-python, tramp-get-remote-gid)
(tramp-get-env-with-u-option): Add missing docstrings.

* lisp/net/tramp.el (tramp-obsolete-methods)
(tramp-warned-obsolete-methods): Remove.
(tramp-find-method): Do not check for obsolete methods any longer.
2016-08-07 08:45:12 +02:00
Noam Postavsky
37cef5fbfe Make sh-mode always use p-s-lookup-properties
This lets functions which rely on syntax-propertize for parsing
work correctly even before font lock has a chance to run.

* lisp/progmodes/sh-script.el (sh-set-shell): Set
parse-sexp-lookup-properties unconditionally (Bug #4920).
2016-08-06 16:16:02 -04:00
Noam Postavsky
0095837d90 Fix cl-assert with atomp FORM, non-nil SHOW-ARGS
* lisp/emacs-lisp/cl-macs.el (cl-assert): Don't require that FORM is a
list when showing its (non-existent) arguments (Bug #18587).
2016-08-06 16:16:02 -04:00
Noam Postavsky
9ae89c2c99 Don't delete selection after indent-rigidly
* lisp/indent.el (indent-rigidly): Pass `deactivate-mark' as the ON-EXIT
function to `set-transient-map', this prevents `delete-selection-mode'
from deleting the text that was just indented (Bug #20408).
2016-08-06 16:16:02 -04:00
Noam Postavsky
031af49e74 Fix byte-compile of interactive closures
* lisp/emacs-lisp/bytecomp.el (byte-compile--reify-function): Put
bindings after docstring and `interactive' form, if any (Bug #24122).
2016-08-06 16:16:02 -04:00
Noam Postavsky
a90d5e6309 Error if --eval arg has text beyond 1 expression
* lisp/startup.el (command-line-1): If --eval argument has more data
than constitutes a single Lisp expression, signal an error (Bug #23159).
2016-08-06 16:16:02 -04:00
Noam Postavsky
4dec928691 Fix quoted lambda warning from lexical-let
* lisp/emacs-lisp/cl.el (cl--function-convert): Quote the inner lambda
with `function', not `quote' (Bug #11357).
2016-08-06 16:16:02 -04:00
Noam Postavsky
ff400557e8 Make emerge always use shell-quote-argument
* lisp/vc/emerge.el (emerge-metachars): Obsolete.
(emerge-protect-metachars): Delete.
(emerge-make-diff-list, emerge-make-diff3-list): Replace all calls to
`emerge-protect-metachars' with `shell-quote-argument' so that shell
quoting is done the same on all system types (Bug #6136).  Also shell
quote `emerge-diff-program' and `emerge-diff3-program'.
2016-08-06 16:16:02 -04:00
Eli Zaretskii
b593ea1f9b Fix 'dired-diff' when backup file is in another directory
* lisp/dired-aux.el (dired-diff): Clarify the doc string wrt how
the default for FILE is computed, especially when backup files
are involved.  Support backup files in another directory.
Don't suggest the default FILE if it doesn't exist.  (Bug#24089)
2016-08-06 13:13:57 +03:00
Eli Zaretskii
0a327afe2e Fix the 'T' command in Dired with non_ASCII file names
* lisp/dired-aux.el (dired-do-chxxx): Bind coding-system-for-write
to correctly encode file names passed to the invoked PROGRAM.
(Bug#24162)
2016-08-06 12:44:38 +03:00
Noam Postavsky
f50e641548 * lisp/files.el (version-control): Drop :group vc (Bug #14687) 2016-08-05 20:08:15 -04:00
Paul Eggert
c1b5000d8c Merge from origin/emacs-25
d841a03 ; Spelling fix
a6ae479 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398 Update to the AUTHORS file for Bob Weiner
4d2f4df Revert "Fix local printer set to left aligned string formatter."
cd1b4d6 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e Revert "Fix English."
baa7abd Improve doc strings of 'gud-gdb' and 'gdb'
aa4271a Fix doc string of 'minibuffer-message-timeout'
b275cc7 Fix English.
3c97b0f Fix ses-delete-blanks to delete only blanks + documentation.
272391f profiler: document prefix arg for tree expansion
442cc39 Clarify usage of eshell-visual-options
b443c3c Fix comment in files-in-below-directory
8a38e94 Fix local printer set to left aligned string formatter.
0f0b191 ; Fix typos in NEWS
6bdf687 ; * etc/NEWS: Remove temporary marks
2016-08-05 14:10:30 -07:00
Paul Eggert
fe3225830d ; Merge from origin/emacs-25
The following commit was skipped:

3d981dd Bump Emacs version to 25.1 for the first RC
2016-08-05 14:10:30 -07:00
Paul Eggert
0274862f39 Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...

# Conflicts:
#	ChangeLog.2
#	src/lisp.h
2016-08-05 14:10:30 -07:00
Paul Eggert
f902a6b89e ; Merge from origin/emacs-25
The following commits were skipped:

ff3fc21 Port to glibc 2.24 (pre-release) + ppc64
eb9d461 * lisp/net/shr.el (shr-fill-line): Withdraw the last commit (...
4157159 * lisp/net/shr.el (shr-fill-line): Preserve text properties i...
2016-08-05 14:09:09 -07:00
Paul Eggert
a855bf48d4 Merge from origin/emacs-25
9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode
2016-08-05 14:09:09 -07:00
Paul Eggert
8c818d8cb7 ; Merge from origin/emacs-25
The following commit was skipped:

916abe9 Use memmove instead of memcpy on overlapping regions
2016-08-05 14:09:09 -07:00
Paul Eggert
6b780a2e97 Merge from origin/emacs-25
9ba51ed Document buffer-swap-text+save-excursion interaction
452aa94 Fix eieio vs cl-generic incompatibilities found in Rudel (bug...
248d5dd Include cl-generic in package--builtin-versions (bug#22817)
8f5a8b6 Improve timing in `tramp-test29-environment-variables'
05ba7a0 Add test for handling environment variables in Tramp
e393d4f * lisp/emacs-lisp/package.el (describe-package-1) (package-st...
5e38887 ; * lisp/net/tramp.el: Fix 2010-10-04 comment typo.  (Bug#23913)
90f2169 ; Spelling fixes
069fc05 Improve documentation of search functions
0a0144a Delete environment variables in Tramp when needed
f624671 Add "New in Emacs 25" section to the FAQ
658daf9 Fix 'vertical-motion' in non-interactive sessions
686b520 Fix memory leak in imagemagick-types
4069b71 Update ELisp manual to match 'string-collate-equalp' doc string
1b2d6a6 Clarify docstring of find-feature-regexp
aac62a6 Add details to cl-lib defining macros' docstrings
d6aa4da Clarify doc string of 'save-buffer'
03bcf11 Un-confuse doc string of 'string-collate-equalp'
c53135b Clarify documentation of 'mouse-on-link-p'

# Conflicts:
#	lisp/emacs-lisp/eieio-core.el
2016-08-05 14:09:08 -07:00
Paul Eggert
95c6606a47 ; Merge from origin/emacs-25
The following commit was skipped:

8f9c1ed Fix missing undo-boundary on revert-buffer.
2016-08-05 14:07:01 -07:00
Paul Eggert
3498a1a2d5 Merge from origin/emacs-25
6f285d9 Amend last addition to etc/PROBLEMS
7067890 * etc/PROBLEMS: Mention GTK+ problem with unexpected frame wi...
2016-08-05 14:07:01 -07:00
Paul Eggert
20e1d54a3f ; Merge from origin/emacs-25
The following commit was skipped:

a5dcc97 Fix open-network-stream responsiveness
2016-08-05 14:07:01 -07:00