From 6a757bead92a3cb827d9b19a1a5ca931f198c045 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 5 Jun 2017 20:33:55 -0400 Subject: [PATCH] ; ChangeLog fixes --- ChangeLog.2 | 86 +++----------------------------------------- ChangeLog.3 | 4 +-- doc/misc/ChangeLog.1 | 2 +- lisp/ChangeLog.12 | 4 +-- lisp/erc/ChangeLog.1 | 6 +--- lisp/org/ChangeLog.1 | 10 +++--- src/ChangeLog.13 | 2 +- 7 files changed, 16 insertions(+), 98 deletions(-) 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. diff --git a/ChangeLog.3 b/ChangeLog.3 index f187c2852f7..51245e77608 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1629,7 +1629,7 @@ * etc/NEWS: Mention addition of 'cyrillic-tuvan' input method. -2016-11-18 Alex +2016-11-18 Alexander Gramiak Extend 'indent-relative' when its arg is non-nil @@ -18731,7 +18731,7 @@ * test/lisp/net/network-stream-tests.el: New suite of network tests. -2016-02-07 Foo +2016-02-07 Rasmus Pank Roulund Allow various Gnus and Message address variables to be functions diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index b3cb6a501a0..b6c6c294446 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -822,7 +822,7 @@ * efaq.texi (Problems with very large files): Fix superscript typo. -2013-01-07 Rasmus +2013-01-07 Rasmus Pank Roulund * org.texi (Global and local cycling): Fix missing '@'. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 46db752e467..04c5d8138dc 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -14350,7 +14350,7 @@ * progmodes/ld-script.el (auto-mode-alist): Recognize linker scripts whose file-name extensions are "\.x[bdsru]?[cn]?$". -2006-01-01 Michael Ernst (tiny changes) +2006-01-01 Michael Ernst (tiny change) * textmodes/tildify.el: Fix typos (misspellings) in the commentary. @@ -30895,7 +30895,7 @@ * textmodes/tex-mode.el (tex-view): If tex-shell process is not running, restart it. -2005-03-19 Yoichi NAKAYAMA (tiny changes) +2005-03-19 Yoichi NAKAYAMA (tiny change) * finder.el (finder-current-item): Throw an error on an empty line. diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 373b179b6f0..2d5403fdc17 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -6289,7 +6289,7 @@ * make 353 (NAMES reply) output go into the appropriate channel buffer (if it exists) or into the active erc buffer (if not). -2003-08-29 mtoledo +2003-08-29 Marcelo Toledo * erc.el: Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today. @@ -11635,10 +11635,6 @@ (erc-join-info-buffer): Changed default to 'disable. (erc-nick-completion): Changed default to 'all. -2001-07-04 uid31117 - - * erc.el: Resolved... - 2001-07-03 Alex Schroeder * erc.el(erc-highlight-strings): New option and new function. diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 4fc9f5fe1c1..9d2c6663919 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -1176,7 +1176,7 @@ * org.el (org-mode): Add guard around set-face-foreground. -2014-04-22 Rasmus +2014-04-22 Rasmus Pank Roulund * ox-html.el (org-html-html5-elements): Drop reference to hgroup. @@ -6519,14 +6519,14 @@ (org-insert-link): Call `org-link-try-special-completion' from the original buffer. -2013-11-12 Oleh +2013-11-12 Oleh Krehel * org.el (org-open-at-point): The new code is being run in the same spot as `org-open-link-functions'. In case they failed, check if link matches "^id:" and if so, load the id interface and follwo the link. -2013-11-12 Rasmus (tiny change) +2013-11-12 Rasmus Pank Roulund (tiny change) * ox-latex.el (org-latex--inline-image): The pgf format is associated to an inline image and treated like tikz files. @@ -6760,7 +6760,7 @@ * org-clock.el (org-clock-notify-once-if-expired): Honor `org-clock-sound'. -2013-11-12 Rasmus Pank +2013-11-12 Rasmus Pank Roulund * org.el (org-format-latex-header): Remove eucal and amsmath. (org-latex-default-packages-alist): Remove amstext and add @@ -11195,7 +11195,7 @@ * org-latex.el (org-export-as-latex): Fix bug in setting the export directory according to the LaTeX options. -2012-04-01 K.Nagashima (tiny change) +2012-04-01 K. Nagashima (tiny change) * org.el (org-show-subtree): Make interactive. diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 3a58c0cc754..66f062d3d3f 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -17504,7 +17504,7 @@ * casetab.c (init_casetab_once): Don't abuse the ascii eqv table for the upcase table. -2013-03-27 rzl24ozi (tiny changes) +2013-03-27 rzl24ozi (tiny change) * image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function. -- 2.39.5