From 6a757bead92a3cb827d9b19a1a5ca931f198c045 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 5 Jun 2017 20:33:55 -0400 Subject: ; ChangeLog fixes --- ChangeLog.2 | 86 +++---------------------------------------------------------- 1 file changed, 4 insertions(+), 82 deletions(-) (limited to 'ChangeLog.2') diff --git a/ChangeLog.2 b/ChangeLog.2 index 4b266e1e952..3b22d482963 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -5982,10 +5982,6 @@ * lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale markers. -2016-03-30 Alan Mackenzie - - Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25 - 2016-03-29 Xue Fuqiao * doc/lispref/text.texi (Columns): Remove a nonexistent reference. @@ -7279,10 +7275,6 @@ * doc/emacs/maintaining.texi (Identifier Search) (Looking Up Identifiers): Remove the word "valid" (bug#22692). -2016-02-28 Michael Albinus - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2016-02-28 Michael Albinus Set auto-revert-use-notify to nil in global-auto-revert-mode. (Bug#22814) @@ -8740,10 +8732,6 @@ that we get case-insensitive completion. (erc-completion-at-point): Remove. -2016-02-05 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2016-02-05 Michael Albinus * test/automated/file-notify-tests.el (file-notify-test06-many-events): @@ -10159,18 +10147,10 @@ alternative, such as "This allow you to do something", "This allows something to be done" or "This allows the doing of something". -2016-01-24 l3thal - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2016-01-24 Kelvin White Add NEWS entry for asynchronous reconnect in ERC -2016-01-24 l3thal - - Add NEWS entry for asynchronous reconnect in ERC - 2016-01-24 Kelvin White browse-url.el: Add 'google-chrome' to supported browsers. @@ -11063,10 +11043,6 @@ (hide-ifdef-undef, show-ifdef-block): Don't use '(interactive "r")' in commands that should only act on the region if it's active. -2016-01-15 Phillip Lord - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2016-01-15 Phillip Lord Enable test selector from command line @@ -11905,10 +11881,6 @@ (c-after-change): Amend c-new-END here, rather than initializing it and c-new-BEG. -2016-01-04 Michael Albinus - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2016-01-04 Michael Albinus Introduce check-expensive tests. @@ -13594,10 +13566,6 @@ * etc/tutorials/TUTORIAL.pt_BR: Fix a typo. (Bug#22165) -2015-12-13 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-12-13 Tassilo Horn Improve regex to not trigger stack overflow @@ -14202,19 +14170,13 @@ (ifconfig-program-options): Check the actual program in use. (arp-program): Check sbin directories. -2015-12-04 (tiny change) Arash Esbati (tiny change) +2015-12-04 Arash Esbati (tiny change) Fix wrong-type-argument integer-or-marker-p nil error * lisp/textmodes/reftex-auc.el (reftex-what-index-tag): Fix (wrong-type-argument integer-or-marker-p nil) error (bug#22077). -2015-12-04 Alan Mackenzie - - Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch/follow - - Merge necessitated by a rebase operation. - 2015-12-04 Alan Mackenzie lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall. @@ -15012,10 +14974,6 @@ (isearch-new-regexp-function): Define variable. (isearch-new-word): Define as an obsolete alias. (Bug#22018) -2015-11-27 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-27 Lee Bochicchio * test/automated/abbrev-tests.el: Define more tests @@ -15099,10 +15057,6 @@ that this function runs Lisp. Suggested by Richard Stallman . -2015-11-26 Phillip Lord - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-26 Phillip Lord Fix regression after merge. @@ -15360,10 +15314,6 @@ (dynlib_addr) [WINDOWSNT]: Non-trivial implementation to report the full file name of the module for a given address. -2015-11-24 Alan Mackenzie - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-24 Alan Mackenzie Squashed commit of the following: @@ -15540,10 +15490,6 @@ (module_copy_string_contents): Encode before reading the byte size. Return false if and only if an error occurred. -2015-11-23 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-23 Shakthi Kannan Add the tamil-dvorak input method @@ -16719,10 +16665,6 @@ * CONTRIBUTE (Branches): Improve wording for back-ported commits. -2015-11-14 Dmitry Gutov - - Merge branch 'master' into emacs-25 - 2015-11-14 Dmitry Gutov Use generic dispatch for xref backends @@ -16814,15 +16756,9 @@ (xref-query-replace): Ditto. And check that the search results are up-to-date. -2015-11-13 John Wiegley - - Merge remote-tracking branch 'origin/master' into emacs-25 +2015-11-13 Kelvin White -2015-11-13 l3thal - - Merge branch 'erc-async-reconnect' into emacs-25 - - Reconnect asynchronously. + Reconnect asynchronously in erc. 2015-11-13 Paul Eggert @@ -16843,10 +16779,6 @@ mflt_run to leave the output areas unchanged on failure, as this isn’t part of its interface spec. -2015-11-13 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-13 Paul Eggert Port recent XCB changes to 64-bit ‘long int’ @@ -31789,7 +31721,7 @@ * lisp/emacs-lisp/package.el (package-menu-execute): Remove reference to remove-dups. -2015-05-21 kwhite +2015-05-21 Kelvin White * lisp/erc/erc.el: Hide network/channel messages. (erc-network-hide-list, erc-channel-hide-list): New lists to define @@ -32188,14 +32120,8 @@ * lisp/eshell/esh-arg.el (eshell-parse-special-reference): Parse '#'. -2015-05-17 Jan D - - Merge branch 'master' into cairo - 2015-04-26 Jan D - Merge branch 'master' into cairo - Add PBM support for cairo * src/image.c (xcolor_to_argb32): New function. (get_spec_bg_or_alpha_as_argb): Call xcolor_to_argb32. @@ -32262,10 +32188,6 @@ * src/xterm.c (x_update_begin): Don't create any surface for non-visible tip frames, the geometry may be wrong. - Merge branch 'master' into cairo, fixes tooltips not shown. - - Merge branch 'master' into cairo - Add CAIRO_CFLAGS to lwlib/Makefile.in * Makefile.in (CAIRO_CFLAGS): Add. -- cgit v1.2.1