GitLab

* ChangeLog.2: Copy from emacs-25 branch.
* ChangeLog.3: New file, with changes only in master.
* Makefile.in (CHANGELOG_HISTORY_INDEX_MAX): Bump from 2 to 3.

eeecac7a Fix minor quoting problems in doc strings

The following commit was skipped:

da71c89b * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix docs...

35ce3fb1 Don't assume window-point and point are the same

The following commit was skipped:

a3487a81 Fix bug#25087

ba2847f5 ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change.  ...
8b43f97e * lisp/vc/ediff-util.el (ediff-janitor): Doc fix.  (Bug#25046)
c20035cd ; * doc/emacs/programs.texi (Man Page): Fix last change.
93d83462 Improve indexing of 'man'

The following commits were skipped:

c4919896 Port to Sun C 5.14
95eb6414 Fix mail-combine-fields

d31298d8 Fix documentation of `window-combination-resize'
2086f4c0 Typo fixes in elisp manual

The following commit was skipped:

f6da5973 ; Revert "Guard terminal par. in XTerm mouse mode"

39809036 ; Update ChangeLog.2, etc/AUTHORS and ldef-boot.el for Emacs ...
5878abf8 Fix 'expand-file-name' during startup on MS-Windows

The following commit was skipped:

46065291 ; ChangeLog.2 update

9a857b92 * admin/authors.el (authors-renamed-files-alist): Addition.
6d27423d Tweak refcard note about documentation location
e46a1344 Improve treatment of Fortran's "class is"

The following commits were skipped:

36743173 Bump Emacs version to 25.1.90
938e3166 ; Revert "Bump Emacs version"
596289bc Bump Emacs version
dcfe4d11 ; ChangeLog.2 update

93c0f512 Handle TeX comments when making new paragraph
e0884f1d Restore keystroke echo in 'C-q'
a6213ce4 Improve documentation of 'current-word'
08281269 Fix a typo in an Eshell defcustom
2e361c74 Minor copyedits of electric-pair-mode
7499ee8d ; Minor copyedit in the Emacs manual
45b652b6 Fix documentation of 'invocation-directory'
7f43d7c0 * admin/authors.el (authors-aliases): Add an entry.
ba488800 ; Fix pl-refcard.tex

The following commit was skipped:

d4e15492 Guard terminal parameter in XTerm mouse mode

7287e965 ; * src/lread.c (openp): Correct an inaccuracy in commentary.

The following commit was skipped:

3f2b497c * etc/AUTHORS: Regenerate the AUTHORS file

3d63b488 Update ChangeLog files and authors.el
9d302640 Fix menu bindings of Dired 'A' and 'Q' commands
a725592d Avoid errors in shr-pixel-column due to dedicated windows
3138598d Update format-time-string documentation

* lisp/simple.el (region-modifiable-p): New function.
(delete-trailing-whitespace): Us it to avoid trying to delete read-only text.

* src/Makefile.in (NON_OBJC_CFLAGS): New macro.
(ALL_OBJC_CFLAGS): Use it.
(EMACS_CFLAGS): New macro, with most of the old ALL_CFLAGS.
(ALL_CFLAGS, ALL_OBJC_FLAGS): Use it.

* lisp/net/tramp.el (tramp-get-remote-tmpdir): Add also hop to result.
(tramp-unquote-shell-quote-argument): New defun.
(tramp-shell-quote-argument):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-make-copy-program-file-name):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-set-file-acl)
(tramp-smb-shell-quote-argument): Use it.

It was deleted in previous commit, but it's referenced
by the macro 'define-ibuffer-op'.
* lisp/ibuffer.el (ibuffer-map-deletion-lines): Reinclude it.

* lisp/ibuffer.el (ibuffer-map-deletion-lines): Delete it.
(ibuffer-unmark-all): Simplify code.

* lisp/ibuf-macs.el (define-ibuffer-filter): Do not store
in 'ibuffer-filtering-qualifiers' a wrong filter (Bug#25042).
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25042): Add test.

so that it matches the actual implementation.
See https://lists.gnu.org/archive/html/help-gnu-emacs/2016-04/msg00071.html

* lisp/ibuf-ext.el (ibuffer-delete-alist): Remove it.
(ibuffer-remove-alist): New defun; it supersedes 'ibuffer-delete-alist'.
All callers changed (Bug#25058).
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): Add test.

* lisp/ibuffer.el (ibuffer-unmark-backward):
Use 'ibuffer-get-region-and-prefix'; call 'ibuffer-unmark-forward'
with the region boundary as the first 2 arguments (Bug#24987).

* lisp/emacs-lisp/seq.el (seq-some): Make the docstring less confusing
  regarding the returned value.

* lisp/dired.el (dired-unmark-backward): Call 'dired-unmark' with
a non-nil second argument (Bug#24986).

Fix previous commit.
* test/lisp/vc/ediff-ptch-tests.el: New test.

* lisp/vc/ediff-ptch.el (ediff-context-diff-label-regexp): Skip
'\n' in file names (Bug#25010).
* test/lisp/vc/ediff-ptch-tests.el: New file.
(ibuffer-test-bug25010): Add test for Bug#25010.

* lisp/ibuf-ext.el (ibuffer-decompose-filter):
Update 'ibuffer-filtering-qualifiers' only if there is no error (Bug#24997).
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug24997):
Update test result as pass.

* lisp/ibuffer (ibuffer-update-title-and-summary, ibuffer-redisplay-current)
(ibuffer-buffer-name-face, ibuffer-unmark-all)
(ibuffer-count-deletion-lines, ibuffer-buffer-names-with-mark):
Use 'eq' instead of 'char-equal' when comparing mark characters (Bug#25000).
* test/lisp/ibuffer-tests.el (ibuffer-test-Bug25000):
Update test result as pass.

Fix Bug#25049.
* lisp/ibuf-ext.el (ibuffer-saved-filters): Remove extra
nesting level; add transparent setter to adjust old-format values;
update doc string.
(ibuffer-save-filters): Remove extra level of nesting
in ibuffer-saved-filters values when saving new filters.
(ibuffer-old-saved-filters-warning): New variable with
clickable message with repair options to be displayed
as a warning if 'ibuffer-repair-saved-filters' detects
a format mismatch.
(ibuffer-repair-saved-filters): Add new command to check and
repair saved filters format.
(ibuffer-included-in-filter-p, ibuffer-decompose-filter):
Change access of saved filter data (cadr->cdr) to account
for reduced nesting.
* test/lisp/ibuffer-tests.el (ibuffer-save-filters):
New test; check that filters are saved in the proper format.

* etc/MACHINES: Remove obsolete discussion of IRIX.
* src/process.c (allocate_pty) [__sgi]: Remove SGI-specific code.
(create_process) [HAVE_PTYS]: Don't worry about IRIX.
* src/syntax.c (scan_sexps_forward): Remove obsolete comment.
* src/unexelf.c [__sgi]: Don't include <syms.h>.
(unexec) [__sgi]: Remove SGI-specific code.

* src/bytecode.c (exec_byte_code):
* src/image.c (parse_image_spec):
Prefer FUNCTIONP (x) to !NILP (Ffunctionp (x)).
* src/eval.c (FUNCTIONP): Move here ...
* src/lisp.h: ... from here.  No longer inline, as that
bloats the text and does not help speed (at least on my platform).
(functionp): Remove this name, since callers use FUNCTIONP.

The function `cursor-sensor--detect' calls `bobp' to decide whether to
check properties at (1- (window-point)).  However, (window-point) may be
at beginning of buffer, even if (point) is not.  In this case an
`args-out-of-range' error will be signaled (Bug#25104).

* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Check the
value of (window-point) against (point-min), rather than (bobp) to
decide if (1- (window-point)) is accessible.

For hashtable entries with symbol keys, `test-completion' would convert
the key to a string before calling PREDICATE, unlike `try-completion'
and `all-completions'.

* src/minibuf.c (Ftest_completion): Pass original key from hashtable.