Merge from origin/emacs-25
dacde7e
* etc/AUTHORS: Update the AUTHORS file478ca5d
; fix changelog entries2b7d006
; make change-history-commit851decb
* lisp/dired-aux.el: Require cl-lib. (Bug#22613)47896c8
; Improve commentary in insdel.c53ca1e1
Index tilde characters in names of backup filesd97f522
Document deprecation of hi-lock-mode's 'C-x w' bindingsb55f06d
; * etc/NEWS: Use double spaces to end a sentence.28bb214
Announce that the `C-x w' bindings are deprecated1c98f98
Suppress GNUstep hardeningd82f24b
Fix redisplay after a large insertion85a2753
Revert "Fix gnus-group-get-new-news-this-group on group with closed server" e8e3db0 ; Improve merge documentation in CONTRIBUTE 5be9989 * lib-src/make-docfile.c: Include stdarg.h.c95ebbf
Extend gpm-mouse-mode's doc string and doc to point out limitations.
This commit is contained in:
commit
c79978fcad
13 changed files with 567 additions and 56 deletions
20
CONTRIBUTE
20
CONTRIBUTE
|
@ -184,15 +184,19 @@ If you are fixing a bug that exists in the current release, be sure to
|
|||
commit it to the release branch; it will be merged to the master
|
||||
branch later.
|
||||
|
||||
However, if you know that the change will be difficult to merge to the
|
||||
trunk (eg because the trunk code has changed a lot), you can apply the
|
||||
change to both trunk and branch yourself. It could also happen that a
|
||||
change is cherry-picked from master to the release branch, and so
|
||||
doesn't need to be merged back. In these cases, indicate in the
|
||||
release branch commit log that there is no need to merge the commit to
|
||||
the trunk; start the commit message with "Backport:". gitmerge.el
|
||||
will then exclude that commit from the merge to trunk.
|
||||
However, if you know that the change will be difficult to merge to
|
||||
master (eg because the code on master has changed a lot), you can
|
||||
apply the change to both master and branch yourself. It could also
|
||||
happen that a change is cherry-picked from master to the release
|
||||
branch, and so doesn't need to be merged back. In these cases,
|
||||
indicate in the release branch commit log that there is no need to
|
||||
merge the commit to master; start the commit message with "Backport:".
|
||||
gitmerge.el will then exclude that commit from the merge to trunk.
|
||||
|
||||
Some changes should not be merged to master at all, for whatever
|
||||
reasons. These should be marked by including something like "Do not
|
||||
merge to master" or anything that matches gitmerge-skip-regexp (see
|
||||
gitmerge.el) in the log message.
|
||||
|
||||
** Other process information
|
||||
|
||||
|
|
456
ChangeLog.2
456
ChangeLog.2
|
@ -1,3 +1,458 @@
|
|||
2016-02-15 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* lisp/dired-aux.el: Require cl-lib. (Bug#22613)
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Index tilde characters in names of backup files
|
||||
|
||||
* doc/emacs/files.texi (Backup Names): Improve indexing.
|
||||
(Bug#22625)
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Document deprecation of hi-lock-mode's 'C-x w' bindings
|
||||
|
||||
* doc/emacs/display.texi (Highlight Interactively): Deprecate the
|
||||
"C-x w" bindings of hi-lock-mode.
|
||||
|
||||
* etc/NEWS: Mark the deprecation entry as documented.
|
||||
|
||||
2016-02-15 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
Announce that the `C-x w' bindings are deprecated
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Suppress GNUstep hardening
|
||||
|
||||
Fedora 23 normally hardens GNUstep applications, which causes
|
||||
‘./configure --with-ns’ to break Emacs’s funky way of undumping.
|
||||
Fix this by eliding the hardening options (Bug#22518).
|
||||
* src/Makefile.in (LIBS_GNUSTEP): Omit options like
|
||||
‘-specs=/usr/lib/rpm/redhat/redhat-hardened-ld’.
|
||||
(GNU_OBJC_CFLAGS): Omit options like
|
||||
‘-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1’.
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Fix redisplay after a large insertion
|
||||
|
||||
* src/xdisp.c (redisplay_internal): Don't accept the results of
|
||||
"optimization 3" if the cursor ends up in a partially visible
|
||||
glyph row. (Bug22637)
|
||||
|
||||
2016-02-15 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
Revert "Fix gnus-group-get-new-news-this-group on group with closed server"
|
||||
|
||||
This reverts commit 9dc77e37aa84c6df9b3ddb4609f3c09201b0580e.
|
||||
|
||||
* lisp/gnus/nnimap.el (nnimap-change-group): Revert last
|
||||
change. (Bug#22634)
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* lib-src/make-docfile.c: Include stdarg.h.
|
||||
|
||||
2016-02-15 Alan Mackenzie <acm@muc.de>
|
||||
|
||||
Extend gpm-mouse-mode's doc string and doc to point out limitations.
|
||||
|
||||
* lisp/t-mouse.el (gpm-mouse-mode): Extend doc string to indicate the
|
||||
inability to transfer text between Emacs and other programs which use GPM.
|
||||
|
||||
* doc/emacs/frames.texi (Text-Only Mouse): Note the inability to transfer text
|
||||
between Emacs and other progrmas which use GPM.
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Revert "Backport: * lisp/isearch.el: Turn char-folding off by default"
|
||||
|
||||
* lisp/isearch.el: Turn char-folding back oon by default.
|
||||
|
||||
This reverts commit 12c50e82c9b432b2fc31f8fb2215f43ceea80822.
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Revert "Support integer image rotation and respect EXIF rotations"
|
||||
|
||||
This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8.
|
||||
|
||||
This change does not work on Fedora.
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Revert "Document EXIF image rotation"
|
||||
|
||||
This reverts commit 10b8ed27ec91ff52f93eb0297dcc3abb214931aa.
|
||||
|
||||
This change does not work on Fedora, for instance.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Document OS X LANG default
|
||||
|
||||
* doc/emacs/cmdargs.texi (General Variables):
|
||||
Document OS X Language and Region system preference.
|
||||
Suggested by Alan Third.
|
||||
|
||||
2016-02-15 Alan Third <alan@idiocy.org>
|
||||
|
||||
Set locale when run from OS X GUI
|
||||
|
||||
* src/emacs.c (main): Call ns_init_locale.
|
||||
* src/nsterm.m (ns_init_locale): Get locale from OS and set LANG.
|
||||
* src/nsterm.h: Include ns_init_locale.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
make-docfile cleanup for I/O, etc.
|
||||
|
||||
* lib-src/make-docfile.c (progname, generate_globals, num_globals)
|
||||
(num_globals_allocated, globals): Now static.
|
||||
(generate_globals, struct rcsoc_state, read_c_string_or_comment):
|
||||
(write_c_args, scan_c_stream, search_lisp_doc_at_eol, scan_lisp_file):
|
||||
Use bool for boolean.
|
||||
(verror): New function.
|
||||
(fatal, error): Use it. API is now like printf. All callers changed.
|
||||
(main): Remove err_count local that was always 0.
|
||||
(main, scan_c_stream, scan_lisp_file): Check for I/O error.
|
||||
(scan_file, scan_c_file, scan_c_stream, scan_lisp_file):
|
||||
Return void, not 0.
|
||||
(put_char, scan_keyword_or_put_char, scan_c_file): Use char for byte.
|
||||
(scan_keyword_or_put_char): Check for missing ( and unexpected EOF.
|
||||
(close_emacs_globals): Use ptrdiff_t for index, not int.
|
||||
(scan_c_file, scan_lisp_file): Exit with failure if file cannot be
|
||||
opened, rather than diagnosing but exiting with status 0.
|
||||
(search_lisp_doc_at_eol): Don't worry about ungetc of EOF; it's
|
||||
portable now.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Memory-management cleanup in make-docfile
|
||||
|
||||
I compiled it with -fsanitize=address and fixed the leaks it detected.
|
||||
Also, I changed it to prefer signed to unsigned integer types,
|
||||
and to check for integer overflow.
|
||||
* lib-src/make-docfile.c:
|
||||
Include <stddef.h>, <stdint.h>, <intprops.h>, <min-max.h>.
|
||||
(memory_exhausted): New function.
|
||||
(xmalloc, xrealloc): Use it.
|
||||
(xmalloc, xrealloc, scan_file, struct rcsoc_state, write_c_args)
|
||||
(uncompiled, scan_lisp_file):
|
||||
Prefer signed integer types to unsigned.
|
||||
(xstrdup): Remove. All uses removed.
|
||||
(num_globals, num_globals_allocated, write_globals, scan_c_stream):
|
||||
Use ptrdiff_t, not int, for indexes that in theory could exceed INT_MAX.
|
||||
(add_global): Use const to pacify --enable-gcc-warnings.
|
||||
Make a copy here, rather than relying on strdup calls later.
|
||||
(add_global, write_globals, scan_c_stream):
|
||||
Avoid integer overflow when calculating sizes.
|
||||
(write_globals, scan_c_stream, scan_lisp_file): Avoid memory leak.
|
||||
(scan_c_stream): Check for add_global failure.
|
||||
|
||||
2016-02-15 Kevin Gallagher <Kevin.Gallagher@boeing.com>
|
||||
|
||||
Kevin Gallagher has new email address
|
||||
|
||||
* lisp/emulation/edt.el:
|
||||
* lisp/emulation/edt-lk201.el:
|
||||
* lisp/emulation/edt-mapper.el:
|
||||
* lisp/emulation/edt-pc.el:
|
||||
* lisp/emulation/edt-vt100.el:
|
||||
* etc/edt-user.el:
|
||||
* doc/misc/edt.texi: Update Kevin Gallagher's email address.
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Improve doc strings of 'forward/backward-word-strictly'
|
||||
|
||||
* lisp/simple.el (backward-word): Refer to 'backward-word-strictly'
|
||||
in the doc string. Suggested by Glenn Morris <rgm@gnu.org>.
|
||||
* lisp/subr.el (forward-word-strictly, backward-word-strictly):
|
||||
Mention 'subword-mode' in the doc strings.
|
||||
|
||||
* src/syntax.c (Fforward_word): Refer to 'forward-word-strictly'
|
||||
in the doc string. (Bug#22560)
|
||||
|
||||
2016-02-15 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
Describe Makefile test targets in test/README
|
||||
|
||||
* CONTRIBUTE: Move Makefile test targets to test/README.
|
||||
|
||||
* Makefile.in:
|
||||
* test/README: Describe Makefile test targets.
|
||||
|
||||
2016-02-15 Artur Malabarba <bruce.connor.am@gmail.com>
|
||||
|
||||
Backport: * lisp/isearch.el: Turn char-folding off by default
|
||||
|
||||
(search-default-mode): Set default value to nil.
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Document EXIF image rotation
|
||||
|
||||
* doc/lispref/display.texi (ImageMagick Images): Mention EXIF rotation.
|
||||
|
||||
2016-02-15 Dima Kogan <dima@secretsauce.net>
|
||||
|
||||
Support integer image rotation and respect EXIF rotations
|
||||
|
||||
* src/image.c (imagemagick_load_image): Allow integer rotations in
|
||||
addition to floating point rotations (bug#22591).
|
||||
* src/image.c (imagemagick_load_image): Images that have an
|
||||
orientation given in EXIF and have no explicit :rotation tag are now
|
||||
pre-rotated. All information such as width/height is reported for the
|
||||
rotated image.
|
||||
|
||||
2016-02-15 Matthew Carter <m@ahungry.com>
|
||||
|
||||
Quote table names for postgres listings (sql-mode)
|
||||
|
||||
* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
|
||||
unquoted table names to the completion list.
|
||||
|
||||
2016-02-15 Juri Linkov <juri@linkov.net>
|
||||
|
||||
* lisp/replace.el (replace-match-maybe-edit): Make arg `backward' optional.
|
||||
|
||||
Doc fix.
|
||||
(replace-search, replace-highlight): Make arg `backward' optional.
|
||||
(Bug#18388)
|
||||
|
||||
2016-02-15 Juri Linkov <juri@linkov.net>
|
||||
|
||||
* lisp/simple.el (next-line-or-history-element): Reset temporary-goal-column.
|
||||
|
||||
(previous-line-or-history-element): Reset temporary-goal-column.
|
||||
Use end-of-visual-line instead of line-end-position. (Bug#22544)
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Suppress ACL ops if configured with --disable-acl
|
||||
|
||||
Without this patch, some ACL operations were suppressed, but not all.
|
||||
* src/fileio.c [!USE_ACL]: Do not include sys/acl.h.
|
||||
(Ffile_acl, Fset_file_acl) [!USE_ACL]: Return nil in this case.
|
||||
|
||||
2016-02-15 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
Mention web bugs
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization):
|
||||
Mention web bugs in the mm-html-blocked-images section.
|
||||
|
||||
2016-02-15 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
Make mm-html-blocked-images default to "" again
|
||||
|
||||
* lisp/gnus/mm-decode.el (mm-html-blocked-images):
|
||||
Default to "" that blocks all external images.
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization):
|
||||
Mention that mm-html-blocked-images defaults to "".
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Minor alignas cleanup
|
||||
|
||||
* src/lisp.h (alignas): Remove now-redundant #ifdef that was left
|
||||
over from the old way of doing things, before Bug#20862 was fixed.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Add lmalloc commentary and tweak laligned
|
||||
|
||||
* src/alloc.c (laligned): Help compiler in a tiny way by putting
|
||||
the more-commonly-failing disjunct first.
|
||||
|
||||
2016-02-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Clarify documentation of key binding conventions
|
||||
|
||||
* doc/lispref/tips.texi (Key Binding Conventions): Clarify which
|
||||
"punctuation characters" are reserved after "C-c". (Bug#22604)
|
||||
|
||||
2016-02-15 Oscar Fuentes <ofv@wanadoo.es>
|
||||
|
||||
* etc/NEWS: mention the `vc-faces' customization group
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Sync with gnulib
|
||||
|
||||
This incorporates:
|
||||
2016-02-09 stdalign: port to clang 3.7.0
|
||||
2016-02-06 misc: port better to gcc -fsanitize=address
|
||||
* doc/misc/texinfo.tex, lib/stdalign.in.h, m4/acl.m4, m4/getgroups.m4:
|
||||
Copy from gnulib.
|
||||
|
||||
2016-02-15 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
* CONTRIBUTE: Add more examples for $(SELECTOR) make variable.
|
||||
|
||||
2016-02-15 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
Make mm-html-inhibit-images and mm-html-blocked-images default to nil
|
||||
|
||||
* lisp/gnus/mm-decode.el (mm-html-inhibit-images)
|
||||
(mm-html-blocked-images): Default to nil.
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization): Mention that
|
||||
mm-html-inhibit-images and mm-html-blocked-images default to nil.
|
||||
|
||||
* etc/NEWS (Gnus): Document mm-html-inhibit-images and
|
||||
mm-html-blocked-images.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Increase success rate of fallback lmalloc
|
||||
|
||||
* src/alloc.c (lmalloc, lrealloc): Reallocate with (typically)
|
||||
larger and larger sizes, to increase the probability that
|
||||
the allocator will return a Lisp-aligned pointer.
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Make backgrounds extend to the end of the lines in shr
|
||||
|
||||
* lisp/net/shr.el (shr-face-background): Faces can also be on
|
||||
the form `(:background "#fff)' (bug#22547).
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Make the `R' command get the correct relative <img>s
|
||||
|
||||
* lisp/net/eww.el (eww-readable): Preserve the base URL so
|
||||
that image expansions are fetched from the right place (bug#22605).
|
||||
|
||||
(cherry picked from commit 8722e849f75ceafb82a1c17105e8ab76077a8ebc)
|
||||
|
||||
Backport:
|
||||
|
||||
2016-02-15 Mike Kupfer <m.kupfer@acm.org>
|
||||
|
||||
Fix typos in emacs-mime.texi and gnus.texi
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization):
|
||||
* doc/misc/gnus.texi (HTML): Fix typo.
|
||||
|
||||
2016-02-15 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization):
|
||||
Doc fix for mm-html-inhibit-images.
|
||||
|
||||
2016-02-15 Lars Ingebrigtsen <larsi@gnus.org>
|
||||
|
||||
Fix message-cross-post-followup-to group names
|
||||
|
||||
* lisp/gnus/message.el (message-cross-post-followup-to): Don't
|
||||
insert group names like "nntp+foo:zot", because those aren't valid.
|
||||
|
||||
2016-02-15 David Edmondson <dme@dme.org>
|
||||
|
||||
Compare recipient and keys case-insensitively
|
||||
|
||||
* lisp/gnus/mml2015.el: (mml-secure-check-user-id): When comparing a
|
||||
recipient address with that from a key, do so in a case insensitive
|
||||
manner (bug#22603).
|
||||
|
||||
2016-02-15 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* lisp/gnus/mm-decode.el (mm-alist-to-plist): Doc fix.
|
||||
|
||||
2016-02-15 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
Refactor HTML images handling of Gnus and mm-* (a part of bug#21650)
|
||||
|
||||
* doc/misc/emacs-mime.texi (Display Customization):
|
||||
Remove mm-inline-text-html-with-images; add documentations for
|
||||
mm-html-inhibit-images and mm-html-blocked-images.
|
||||
|
||||
* lisp/gnus/gnus-art.el (gnus-article-show-images):
|
||||
No need to bind mm-inline-text-html-with-images.
|
||||
(gnus-bind-safe-url-regexp): Rename to gnus-bind-mm-vars.
|
||||
(gnus-bind-mm-vars): Rename from gnus-bind-safe-url-regexp;
|
||||
bind mm-html-inhibit-images and mm-html-blocked-images.
|
||||
(gnus-mime-view-all-parts, gnus-mime-view-part-internally)
|
||||
(gnus-mm-display-part, gnus-mime-display-single)
|
||||
(gnus-mime-display-alternative): Use gnus-bind-mm-vars.
|
||||
|
||||
* lisp/gnus/mm-decode.el (mm-inline-text-html-with-images): Remove.
|
||||
(mm-html-inhibit-images, mm-html-blocked-images): New user options.
|
||||
(mm-shr): Bind shr-inhibit-images and shr-blocked-images with
|
||||
mm-html-inhibit-images and mm-html-blocked-images respectively
|
||||
instead of gnus-inhibit-images and gnus-blocked-images.
|
||||
|
||||
* lisp/gnus/mm-view.el (mm-setup-w3m): Use mm-html-inhibit-images
|
||||
instead of mm-inline-text-html-with-images.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Port to FreeBSD 11-CURRENT i386
|
||||
|
||||
Problem reported by Herbert J. Skuhra in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
|
||||
Instead of trying
|
||||
* src/alloc.c (lmalloc, lrealloc, laligned): New functions.
|
||||
(xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
|
||||
(__alignof__) [!__GNUC__ && !__alignof__]: New macro.
|
||||
(MALLOC_IS_GC_ALIGNED): New macro.
|
||||
* src/lisp.h (NONPOINTER_BITS): Remove. All uses removed.
|
||||
No longer needed now that alloc.c uses lmalloc and lrealloc.
|
||||
|
||||
2016-02-15 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
Some fixes in file-notify-tests.el
|
||||
|
||||
* test/automated/file-notify-tests.el
|
||||
(file-notify--test-with-events-check)
|
||||
(file-notify--test-with-events-explainer): New defuns.
|
||||
(file-notify--test-with-events): Use it.
|
||||
(file-notify-test07-backup): Fix docstring. Some of the
|
||||
backends fire two `changed' events. Backup by rename doesn't
|
||||
work for kqueue.
|
||||
|
||||
2016-02-15 Michael Albinus <michael.albinus@gmx.de>
|
||||
|
||||
Fix Bug#22557
|
||||
|
||||
* lisp/filenotify.el (file-notify-callback): Do not send a
|
||||
`stopped' event in case of backup by renaming. (Bug#22557)
|
||||
|
||||
* test/automated/Makefile.in: Use $(SELECTOR_EXPENSIVE) for
|
||||
all targets but check and check-maybe.
|
||||
|
||||
* test/automated/file-notify-tests.el
|
||||
(file-notify--test-read-event-timeout): New defconst.
|
||||
(file-notify--deftest-remote, file-notify--wait-for-events)
|
||||
(file-notify-test02-events)
|
||||
(file-notify-test04-file-validity)
|
||||
(file-notify-test06-many-events): Use it.
|
||||
(file-notify--test-cleanup): Make it more robust. Delete also
|
||||
backup file.
|
||||
(file-notify-test07-backup): New test.
|
||||
|
||||
2016-02-15 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix test for dladdr
|
||||
|
||||
Problem reported by Andreas Schwab in:
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
|
||||
* configure.ac (dladdr): Link with LIBMODULES when checking for
|
||||
this function.
|
||||
|
||||
2016-02-15 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
Fix gnus-group-get-new-news-this-group on group with closed server
|
||||
|
||||
* lisp/gnus/nnimap.el (nnimap-change-group): Lookup server
|
||||
method and pass to nnimap-open-server.
|
||||
|
||||
2016-02-15 Artur Malabarba <bruce.connor.am@gmail.com>
|
||||
2016-02-14 Nicolas Petton <nicolas@petton.fr>
|
||||
|
||||
* doc/lispref/sequences.texi: Add documentation for seq-map-indexed
|
||||
|
@ -31515,6 +31970,7 @@
|
|||
|
||||
This file records repository revisions from
|
||||
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
|
||||
2016-02-15decb15e0496cec0c48d980c88a5a9d7cc00da (inclusive).
|
||||
2016-02-04b6d89ff9288a49099f041752908b5eb9613e (inclusive).
|
||||
commit ba1422e12f80ae1eb2aa9d0ce80c14e3ee4b3950 (inclusive).
|
||||
See ChangeLog.1 for earlier changes.
|
||||
|
|
|
@ -924,7 +924,10 @@ mode for all buffers, use @kbd{M-x global-hi-lock-mode} or place
|
|||
|
||||
Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except
|
||||
that you specify explicitly the regular expressions to highlight. You
|
||||
control them with these commands:
|
||||
control them with the commands described below. (The key bindings
|
||||
below that begin with @kbd{C-x w} are deprecated in favor of the
|
||||
global @kbd{M-s h} bindings, and will be removed in some future Emacs
|
||||
version.)
|
||||
|
||||
@table @kbd
|
||||
@item M-s h r @var{regexp} @key{RET} @var{face} @key{RET}
|
||||
|
|
|
@ -530,11 +530,16 @@ another from the newly saved contents if you save again.
|
|||
|
||||
@node Backup Names
|
||||
@subsubsection Single or Numbered Backups
|
||||
@cindex backup file names
|
||||
@cindex names of backup files
|
||||
|
||||
@cindex @file{~}, in names of backup files
|
||||
@cindex tilde (@file{~}) at end of backup file name
|
||||
When Emacs makes a backup file, its name is normally constructed by
|
||||
appending @samp{~} to the file name being edited; thus, the backup
|
||||
file for @file{eval.c} would be @file{eval.c~}.
|
||||
|
||||
@cindex @file{~/.emacs.d/%backup%~}
|
||||
If access control stops Emacs from writing backup files under the
|
||||
usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
|
||||
Only one such file can exist, so only the most recently made such
|
||||
|
|
|
@ -1275,7 +1275,10 @@ again.
|
|||
@findex gpm-mouse-mode
|
||||
In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
|
||||
enable mouse support. You must have the gpm server installed and
|
||||
running on your system in order for this to work.
|
||||
running on your system in order for this to work. Note that when
|
||||
this mode is enabled, you cannot use the mouse to transfer text
|
||||
between Emacs and other programs which use GPM. This is due to
|
||||
limitations in GPM and the Linux kernel.
|
||||
|
||||
@iftex
|
||||
@xref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},
|
||||
|
|
79
etc/AUTHORS
79
etc/AUTHORS
|
@ -93,9 +93,9 @@ Alan Mackenzie: wrote cc-awk.el
|
|||
and co-wrote cc-align.el cc-cmds.el cc-defs.el cc-engine.el cc-fonts.el
|
||||
cc-langs.el cc-mode.el cc-styles.el cc-vars.el
|
||||
and changed cc-mode.texi bytecomp.el ispell.el isearch.el follow.el
|
||||
font-lock.el programs.texi windows.texi cc-bytecomp.el lread.c subr.el
|
||||
cconv.el display.texi frames.texi functions.texi syntax.c window.c
|
||||
desktop.el edebug.el font-core.el jit-lock.el and 116 other files
|
||||
font-lock.el programs.texi windows.texi cc-bytecomp.el frames.texi
|
||||
lread.c subr.el cconv.el display.texi functions.texi syntax.c window.c
|
||||
desktop.el edebug.el font-core.el jit-lock.el and 117 other files
|
||||
|
||||
Alan Modra: changed unexelf.c
|
||||
|
||||
|
@ -105,6 +105,8 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
|
|||
easy-mmode.el gnus-sum.el ibuf-ext.el ibuffer.el lunar.el macros.el
|
||||
solar.el
|
||||
|
||||
Alan Third: changed emacs.c nsterm.h nsterm.m
|
||||
|
||||
Alastair Burt: changed gnus-art.el smiley.el
|
||||
|
||||
Albert Krewinkel: co-wrote sieve-manage.el
|
||||
|
@ -241,7 +243,7 @@ Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el
|
|||
Andreas Schwab: changed configure.ac lisp.h process.c xdisp.c alloc.c
|
||||
coding.c Makefile.in fileio.c files.el keyboard.c xterm.c lread.c
|
||||
editfns.c emacs.c fns.c src/Makefile.in print.c eval.c font.c sysdep.c
|
||||
xfns.c and 634 other files
|
||||
xfns.c and 635 other files
|
||||
|
||||
Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el
|
||||
gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el
|
||||
|
@ -352,10 +354,10 @@ Artur Malabarba: wrote character-fold-tests.el faces-tests.el
|
|||
isearch-tests.el let-alist.el simple-test.el sort-tests.el
|
||||
tabulated-list-test.el
|
||||
and changed package.el isearch.el character-fold.el files.el
|
||||
tabulated-list.el package-test.el faces.el files-x.el menu-bar.el
|
||||
replace.el align.el bytecomp.el help-fns.el cl-lib-tests.el custom.el
|
||||
custom.texi map.el simple.el subr-tests.el variables.texi bindings.el
|
||||
and 37 other files
|
||||
tabulated-list.el package-test.el menu-bar.el faces.el files-x.el
|
||||
help-fns.el replace.el align.el bytecomp.el custom.texi cl-lib-tests.el
|
||||
custom.el map.el simple.el subr-tests.el variables.texi bindings.el
|
||||
and 39 other files
|
||||
|
||||
Arun Persaud: changed org-agenda.el org-src.el
|
||||
|
||||
|
@ -570,6 +572,8 @@ Carl Edman: co-wrote ns-win.el
|
|||
|
||||
Carl Henrik Lunde: changed format-spec.el
|
||||
|
||||
Carlos Pita: changed erc-pcomplete.el
|
||||
|
||||
Carsten Bormann: changed ibmrs6000.h latin-post.el
|
||||
|
||||
Carsten Dominik: wrote idlw-complete-structtag.el idlw-toolbar.el
|
||||
|
@ -943,7 +947,8 @@ David De La Harpe Golden: changed files.el mouse.el simple.el fileio.c
|
|||
cus-start.el nsselect.m select.el w32-fns.el x-win.el xterm.c
|
||||
|
||||
David Edmondson: changed message.el mml2015.el erc.el gnus-cite.el
|
||||
imap.el mm-uu.el mm-view.el nnfolder.el nnimap.el nnml.el shr.el
|
||||
imap.el mm-uu.el mm-view.el nnfolder.el nnimap.el nnml.el process.c
|
||||
shr.el
|
||||
|
||||
David Engster: wrote mairix.el nnmairix.el
|
||||
and co-wrote gitmerge.el
|
||||
|
@ -1127,7 +1132,8 @@ and changed nntp.el message.el gnus-group.el gnus-sum.el gnus-msg.el
|
|||
Dieter Schuster: changed etags.c
|
||||
|
||||
Dima Kogan: changed erc-backend.el font.c gud.el hideshow.el alloc.c
|
||||
autorevert.el subword.el simple.el winner.el xfaces.c xgselect.c
|
||||
autorevert.el image.c subword.el erc-button.el simple.el winner.el
|
||||
xfaces.c xgselect.c
|
||||
|
||||
Dirk Herrmann: co-wrote bibtex.el
|
||||
|
||||
|
@ -1153,7 +1159,7 @@ Dmitry Gutov: wrote elisp-mode-tests.el json-tests.el vc-hg.el
|
|||
and changed ruby-mode.el xref.el elisp-mode.el etags.el project.el
|
||||
ruby-mode-tests.el vc-git.el ruby.rb package.el vc.el js.el log-edit.el
|
||||
menu-bar.el vc-svn.el minibuffer.el package-test.el progmodes/grep.el
|
||||
find-func.el lisp.el pulse.el simple.el and 81 other files
|
||||
find-func.el lisp.el pulse.el simple.el and 82 other files
|
||||
|
||||
Dmitry Kurochkin: changed isearch.el
|
||||
|
||||
|
@ -1235,8 +1241,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
|
|||
coding-tests.el rxvt.el tty-colors.el
|
||||
and changed xdisp.c msdos.c w32.c w32fns.c files.el display.texi fileio.c
|
||||
simple.el w32proc.c w32term.c dispnew.c emacs.c keyboard.c window.c
|
||||
dispextern.h frames.texi INSTALL src/Makefile.in config.bat files.texi
|
||||
sed1v2.inp and 959 other files
|
||||
dispextern.h frames.texi src/Makefile.in INSTALL config.bat files.texi
|
||||
sed1v2.inp and 979 other files
|
||||
|
||||
Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
|
||||
fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
|
||||
|
@ -1596,7 +1602,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
|
|||
diary-lib.el lisp/Makefile.in files.el rmail.el progmodes/f90.el
|
||||
make-dist simple.el bytecomp.el emacs.texi misc/Makefile.in ack.texi
|
||||
lib-src/Makefile.in startup.el authors.el admin.el cal-menu.el
|
||||
holidays.el and 1590 other files
|
||||
holidays.el and 1593 other files
|
||||
|
||||
Glynn Clements: wrote gamegrid.el snake.el tetris.el
|
||||
|
||||
|
@ -2393,7 +2399,7 @@ Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
|
|||
and changed simple.el files.el simple-test.el vc-svn.el doc-view.el
|
||||
image-mode.el info.el CONTRIBUTE INSTALL autogen.sh isearch.el
|
||||
menu-bar.el thingatpt.el vc-git.el vc-hg.el vc.el vc/vc-bzr.el
|
||||
INSTALL.REPO comint.el configure configure.ac and 12 other files
|
||||
INSTALL.REPO comint.el configure configure.ac and 13 other files
|
||||
|
||||
Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
|
||||
alloc.c files.el frame.c configure.ac window.c data.c minibuf.c
|
||||
|
@ -2424,7 +2430,7 @@ Katsumi Yamaoka: wrote canlock.el
|
|||
and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el
|
||||
mm-util.el gnus-util.el mm-view.el gnus-msg.el gnus-group.el mml.el
|
||||
rfc2047.el gnus-start.el gnus.el shr.el nntp.el gnus-agent.el nnrss.el
|
||||
mm-uu.el nnmail.el gnus-html.el and 153 other files
|
||||
mm-uu.el nnmail.el emacs-mime.texi and 153 other files
|
||||
|
||||
Kaushal Modi: changed calc-yank.el woman.el
|
||||
|
||||
|
@ -2504,6 +2510,8 @@ Kevin Blake: changed font-lock.el ring.el
|
|||
|
||||
Kevin Broadey: wrote foldout.el
|
||||
|
||||
Kevin Brubeck Unhammer: changed erc-track.el
|
||||
|
||||
Kevin Christian: changed gnus-score.el
|
||||
|
||||
Kevin Gallagher: wrote edt-lk201.el edt-mapper.el edt-pc.el edt-user.el
|
||||
|
@ -2602,7 +2610,7 @@ Kurt Swanson: changed gnus-art.el gnus-salt.el gnus-sum.el gnus-ems.el
|
|||
Kyle Jones: wrote life.el
|
||||
and changed saveconf.el buffer.c mail-utils.el sendmail.el
|
||||
|
||||
Kyle Meyer: changed ox.el
|
||||
Kyle Meyer: changed org-compat.el ox.el
|
||||
|
||||
Kyotaro Horiguchi: changed coding.c indent.c
|
||||
|
||||
|
@ -2647,7 +2655,7 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus-score.el
|
|||
and changed gnus.texi gnus-cite.el smtpmail.el pop3.el gnus-xmas.el
|
||||
gnutls.c auth-source.el url-http.el files.el proto-stream.el subr.el
|
||||
dired.el simple.el imap.el image.c nnrss.el text.texi xml.c editfns.c
|
||||
gnutls.el nnultimate.el and 248 other files
|
||||
gnutls.el nnultimate.el and 249 other files
|
||||
|
||||
Lars Rasmusson: changed ebrowse.c
|
||||
|
||||
|
@ -2690,7 +2698,7 @@ and changed octave.el ido.el rcirc.el lisp-mode.el files.el subr.el
|
|||
eldoc.el simple.el flymake.el smie.el abbrev.el progmodes/python.el
|
||||
cfengine.el cl-extra.el cl-macs.el emacs-lisp/cl-lib.el
|
||||
progmodes/compile.el register.el rng-valid.el window.el bindings.el
|
||||
and 159 other files
|
||||
and 160 other files
|
||||
|
||||
Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
|
||||
rmailout.el sendmail.el
|
||||
|
@ -2919,8 +2927,8 @@ Martin Neitzel: changed supercite.el
|
|||
Martin Pohlack: changed iimage.el pc-select.el
|
||||
|
||||
Martin Rudalics: changed window.el window.c windows.texi frame.c w32fns.c
|
||||
xdisp.c w32term.c xterm.c frames.texi xfns.c frame.el help.el buffer.c
|
||||
cus-start.el display.texi dispnew.c window.h dired.el nsfns.m frame.h
|
||||
xdisp.c w32term.c frames.texi xterm.c xfns.c frame.el help.el buffer.c
|
||||
display.texi cus-start.el dispnew.c window.h dired.el nsfns.m frame.h
|
||||
mouse.el and 177 other files
|
||||
|
||||
Martin Stjernholm: wrote cc-bytecomp.el
|
||||
|
@ -2974,6 +2982,8 @@ Matt Curtis: changed pulse.el
|
|||
|
||||
Matt Fidler: changed package.el
|
||||
|
||||
Matthew Carter: changed sql.el
|
||||
|
||||
Matthew Junker: changed cal-tex.el
|
||||
|
||||
Matthew Leach: changed arc-mode.el font-lock.el
|
||||
|
@ -3033,7 +3043,7 @@ and changed tramp.texi dbusbind.c trampver.el trampver.texi tramp-adb.el
|
|||
ange-ftp.el dbus.texi files.el tramp-fish.el autorevert.el files.texi
|
||||
tramp-imap.el os.texi configure.ac lisp.h notifications.el
|
||||
gfilenotify.c keyboard.c tramp-vc.el inotify.c lisp/Makefile.in
|
||||
and 122 other files
|
||||
and 123 other files
|
||||
|
||||
Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
|
||||
unexec.c
|
||||
|
@ -3166,7 +3176,8 @@ Mike Haertel: changed 7300.h
|
|||
|
||||
Mike Kazantsev: changed erc-dcc.el
|
||||
|
||||
Mike Kupfer: changed mh-comp.el mh-e.el mh-utils.el
|
||||
Mike Kupfer: changed emacs-mime.texi gnus.texi mh-comp.el mh-e.el
|
||||
mh-utils.el
|
||||
|
||||
Mike Lamb: changed em-unix.el esh-util.el pcmpl-unix.el
|
||||
|
||||
|
@ -3318,10 +3329,10 @@ Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
|
|||
thunk-tests.el thunk.el
|
||||
and co-wrote auth-source-tests.el subr-tests.el
|
||||
and changed sequences.texi emacs.png emacs23.png obarray-tests.el
|
||||
obarray.el arc-mode.el cl-extra.el emacs.svg Emacs.icns auth-source.el
|
||||
authors.el emacs.ico Makefile.in README data.c emacs-document.svg
|
||||
emacs-document23.svg emacs.texi emacs23.svg files.el fns.c
|
||||
and 3 other files
|
||||
obarray.el README arc-mode.el authors.el cl-extra.el emacs.svg
|
||||
Emacs.icns Makefile.in auth-source.el configure.ac emacs.ico sed2v2.inp
|
||||
data.c emacs-document.svg emacs-document23.svg emacs.texi emacs23.svg
|
||||
and 5 other files
|
||||
|
||||
Nicolas Richard: wrote cmds-tests.el
|
||||
and changed ffap.el package.el help.el keyboard.c landmark.el org.el
|
||||
|
@ -3356,8 +3367,8 @@ and changed rsz-mini.el comint.el emacs-buffer.gdb files.el Makefile
|
|||
|
||||
Noah Lavine: changed tramp.el
|
||||
|
||||
Noam Postavsky: changed buffer-tests.el cmdproxy.c process-tests.el
|
||||
w32proc.c
|
||||
Noam Postavsky: changed buffer-tests.el cmdproxy.c files.el
|
||||
process-tests.el w32proc.c
|
||||
|
||||
Nobuyoshi Nakada: co-wrote ruby-mode.el
|
||||
|
||||
|
@ -3379,6 +3390,8 @@ Nuutti Kotivuori: changed gnus-sum.el flow-fill.el gnus-cache.el
|
|||
|
||||
Odd Gripenstam: wrote dcl-mode.el
|
||||
|
||||
Ogawa Hirofumi: changed gnus-sum.el nnimap.el
|
||||
|
||||
Ognyan Kulev: changed TUTORIAL.bg cyrillic.el
|
||||
|
||||
Okazaki Tetsurou: changed cc-fonts.el vc-svn.el vc.el
|
||||
|
@ -4097,7 +4110,7 @@ Sidney Markowitz: changed doctor.el nsmenu.m
|
|||
Sigbjorn Finne: changed gnus-srvr.el
|
||||
|
||||
Simen Heggestøyl: changed css-mode.el json-tests.el json.el
|
||||
scss-mode.scss files.el js.el scheme.el
|
||||
scss-mode.scss css-mode.css files.el js.el scheme.el
|
||||
|
||||
Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
|
||||
mml-sec.el mml-smime.el password-cache.el rfc2104.el sieve-mode.el
|
||||
|
@ -4330,8 +4343,8 @@ Ted Phelps: changed mh-search.el mh-e.el mh-folder.el mh-junk.el
|
|||
|
||||
Ted Wiles: changed org-habit.el
|
||||
|
||||
Teemu Likonen: changed dired.el erc-backend.el gnus-agent.el indent.el
|
||||
message.el
|
||||
Teemu Likonen: changed dired.el erc-backend.el gnus-agent.el gnus.texi
|
||||
indent.el message.el
|
||||
|
||||
Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el
|
||||
gnus-tests.el gnutls.el registry.el spam-report.el url-future-tests.el
|
||||
|
@ -4592,7 +4605,7 @@ Valentin Wüstholz: changed org.el
|
|||
|
||||
Valery Alexeev: changed cyril-util.el cyrillic.el
|
||||
|
||||
Vasilij Schneidermann: changed ielm.el tetris.el
|
||||
Vasilij Schneidermann: changed eww.el ielm.el tetris.el
|
||||
|
||||
Vasily Korytov: changed cyrillic.el message.el progmodes/python.el
|
||||
ruby-mode.el cperl-mode.el gnus-art.el gnus-dired.el gnus-msg.el
|
||||
|
|
7
etc/NEWS
7
etc/NEWS
|
@ -402,6 +402,11 @@ default.
|
|||
unsaved customizations and prompts user to customize (if found). It
|
||||
is intended for adding to 'kill-emacs-query-functions'.
|
||||
|
||||
+++
|
||||
** The old `C-x w' bindings in hi-lock-mode are officially deprecated
|
||||
in favor of the global `M-s h' bindings introduced in Emacs-23.1.
|
||||
They'll disappear soon.
|
||||
|
||||
|
||||
* Changes in Specialized Modes and Packages in Emacs 25.1
|
||||
|
||||
|
@ -1085,7 +1090,7 @@ replace the face `compare-windows', which is now an obsolete alias for
|
|||
|
||||
---
|
||||
*** The VC state indicator in the mode line now has different faces
|
||||
corresponding to each of the possible states. See the `vc-faces'
|
||||
corresponding to each of the possible states. See the `vc-faces'
|
||||
customization group.
|
||||
|
||||
---
|
||||
|
|
|
@ -36,6 +36,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
|||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
|
||||
;;; Code:
|
||||
|
||||
(require 'cl-lib)
|
||||
;; We need macros in dired.el to compile properly,
|
||||
;; and we call subroutines in it too.
|
||||
(require 'dired)
|
||||
|
|
|
@ -73,7 +73,11 @@ the mode if ARG is omitted or nil.
|
|||
|
||||
This allows the use of the mouse when operating on a GNU/Linux console,
|
||||
in the same way as you can use the mouse under X11.
|
||||
It relies on the `gpm' daemon being activated."
|
||||
It relies on the `gpm' daemon being activated.
|
||||
|
||||
Note that when `gpm-mouse-mode' is enabled, you cannot use the
|
||||
mouse to transfer text between Emacs and other programs which use
|
||||
GPM. This is due to limitations in GPM and the Linux kernel."
|
||||
:global t :group 'mouse :init-value t
|
||||
(dolist (terminal (terminal-list))
|
||||
(when (and (eq t (terminal-live-p terminal))
|
||||
|
|
|
@ -214,8 +214,8 @@ LIBX_OTHER=@LIBX_OTHER@
|
|||
## configure, which should set it to nil in non-X builds.
|
||||
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
|
||||
|
||||
## Only used for GNUstep
|
||||
LIBS_GNUSTEP=@LIBS_GNUSTEP@
|
||||
## Used only for GNUstep.
|
||||
LIBS_GNUSTEP=$(patsubst -specs=%-hardened-ld,,@LIBS_GNUSTEP@)
|
||||
|
||||
LIBSOUND= @LIBSOUND@
|
||||
CFLAGS_SOUND= @CFLAGS_SOUND@
|
||||
|
@ -270,8 +270,8 @@ MSDOS_X_OBJ =
|
|||
NS_OBJ=@NS_OBJ@
|
||||
## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o ns_fontfile if HAVE_NS.
|
||||
NS_OBJC_OBJ=@NS_OBJC_OBJ@
|
||||
## Only set if NS_IMPL_GNUSTEP.
|
||||
GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
|
||||
## Used only for GNUstep.
|
||||
GNU_OBJC_CFLAGS=$(patsubst -specs=%-hardened-cc1,,@GNU_OBJC_CFLAGS@)
|
||||
## w32fns.o w32menu.c w32reg.o fringe.o fontset.o w32font.o w32term.o
|
||||
## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else
|
||||
## empty.
|
||||
|
|
18
src/insdel.c
18
src/insdel.c
|
@ -126,7 +126,10 @@ gap_left (ptrdiff_t charpos, ptrdiff_t bytepos, bool newgap)
|
|||
if (i == 0)
|
||||
break;
|
||||
/* If a quit is requested, stop copying now.
|
||||
Change BYTEPOS to be where we have actually moved the gap to. */
|
||||
Change BYTEPOS to be where we have actually moved the gap to.
|
||||
Note that this cannot happen when we are called to make the
|
||||
gap larger or smaller, since make_gap_larger and
|
||||
make_gap_smaller prevent QUIT by setting inhibit-quit. */
|
||||
if (QUITP)
|
||||
{
|
||||
bytepos = new_s1;
|
||||
|
@ -179,7 +182,10 @@ gap_right (ptrdiff_t charpos, ptrdiff_t bytepos)
|
|||
if (i == 0)
|
||||
break;
|
||||
/* If a quit is requested, stop copying now.
|
||||
Change BYTEPOS to be where we have actually moved the gap to. */
|
||||
Change BYTEPOS to be where we have actually moved the gap to.
|
||||
Note that this cannot happen when we are called to make the
|
||||
gap larger or smaller, since make_gap_larger and
|
||||
make_gap_smaller prevent QUIT by setting inhibit-quit. */
|
||||
if (QUITP)
|
||||
{
|
||||
bytepos = new_s1;
|
||||
|
@ -386,7 +392,9 @@ make_gap_larger (ptrdiff_t nbytes_added)
|
|||
|
||||
enlarge_buffer_text (current_buffer, nbytes_added);
|
||||
|
||||
/* Prevent quitting in move_gap. */
|
||||
/* Prevent quitting in gap_left. We cannot allow a QUIT there,
|
||||
because that would leave the buffer text in an inconsistent
|
||||
state, with 2 gap holes instead of just one. */
|
||||
tem = Vinhibit_quit;
|
||||
Vinhibit_quit = Qt;
|
||||
|
||||
|
@ -432,7 +440,9 @@ make_gap_smaller (ptrdiff_t nbytes_removed)
|
|||
if (GAP_SIZE - nbytes_removed < GAP_BYTES_MIN)
|
||||
nbytes_removed = GAP_SIZE - GAP_BYTES_MIN;
|
||||
|
||||
/* Prevent quitting in move_gap. */
|
||||
/* Prevent quitting in gap_right. We cannot allow a QUIT there,
|
||||
because that would leave the buffer text in an inconsistent
|
||||
state, with 2 gap holes instead of just one. */
|
||||
tem = Vinhibit_quit;
|
||||
Vinhibit_quit = Qt;
|
||||
|
||||
|
|
12
src/xdisp.c
12
src/xdisp.c
|
@ -825,6 +825,7 @@ static Lisp_Object redisplay_window_1 (Lisp_Object);
|
|||
static bool set_cursor_from_row (struct window *, struct glyph_row *,
|
||||
struct glyph_matrix *, ptrdiff_t, ptrdiff_t,
|
||||
int, int);
|
||||
static bool cursor_row_fully_visible_p (struct window *, bool, bool);
|
||||
static bool update_menu_bar (struct frame *, bool, bool);
|
||||
static bool try_window_reusing_current_matrix (struct window *);
|
||||
static int try_window_id (struct window *);
|
||||
|
@ -13881,11 +13882,16 @@ redisplay_internal (void)
|
|||
eassert (this_line_vpos == it.vpos);
|
||||
eassert (this_line_y == it.current_y);
|
||||
set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
|
||||
if (cursor_row_fully_visible_p (w, false, true))
|
||||
{
|
||||
#ifdef GLYPH_DEBUG
|
||||
*w->desired_matrix->method = 0;
|
||||
debug_method_add (w, "optimization 3");
|
||||
*w->desired_matrix->method = 0;
|
||||
debug_method_add (w, "optimization 3");
|
||||
#endif
|
||||
goto update;
|
||||
goto update;
|
||||
}
|
||||
else
|
||||
goto cancel;
|
||||
}
|
||||
else
|
||||
goto cancel;
|
||||
|
|
Loading…
Add table
Reference in a new issue