]>
git.eshelyaron.com Git - emacs.git/log
Stefan Kangas [Mon, 12 Sep 2022 00:47:11 +0000 (02:47 +0200)]
Update HISTORY for Emacs 28.2
* etc/HISTORY: Update for the Emacs 28.2 release.
Stefan Kangas [Tue, 6 Sep 2022 22:25:16 +0000 (00:25 +0200)]
Bump Emacs version to 28.2
* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 28.2.
Stefan Kangas [Tue, 6 Sep 2022 22:20:57 +0000 (00:20 +0200)]
Update ChangeLog and AUTHORS for Emacs 28.2
* ChangeLog.3:
* etc/AUTHORS:
* etc/NEWS: Update for Emacs 28.2.
Stefan Kangas [Tue, 6 Sep 2022 21:27:01 +0000 (23:27 +0200)]
* doc/misc/idlwave.texi (Troubleshooting): Don't say "Emacsen".
Stefan Kangas [Mon, 5 Sep 2022 20:24:05 +0000 (22:24 +0200)]
; * doc/emacs/misc.texi (emacsclient Options): Fix typo.
Stefan Kangas [Tue, 6 Sep 2022 11:57:01 +0000 (13:57 +0200)]
Don't mention very old Emacs versions in docs
* doc/misc/mh-e.texi (Conventions):
* doc/misc/reftex.texi (Problems and Work-Arounds):
* doc/misc/viper.texi (Loading Viper): Delete references to
very old versions of Emacs.
Stefan Kangas [Mon, 5 Sep 2022 13:44:01 +0000 (15:44 +0200)]
* lisp/server.el: Improve Commentary.
Gregory Heytings [Mon, 5 Sep 2022 08:55:10 +0000 (08:55 +0000)]
Explain how the font appearance can be fine-tuned in fbterm.
* doc/misc/efaq.texi (Emacs in a Linux console): Briefly document
Xft font specifications with which the font appearance can be
fine-tuned.
Kyle Meyer [Sun, 4 Sep 2022 01:32:20 +0000 (21:32 -0400)]
Update to Org 9.5.5
Stefan Monnier [Sat, 3 Sep 2022 15:03:01 +0000 (11:03 -0400)]
* lisp/emacs-lisp/comp.el (comp-run-async-workers): Fail more gracefully
Otherwise Emacs may fail to start if it can't find a writable
`~/.emacs.d/eln-cache` directory.
Fixes bug#57562. See also Debian's bug #
1017739 .
Stefan Kangas [Fri, 2 Sep 2022 23:39:55 +0000 (01:39 +0200)]
; Normalize email
Don't merge to master.
Stefan Kangas [Fri, 2 Sep 2022 23:37:09 +0000 (01:37 +0200)]
Update acknowledgments
* doc/emacs/ack.texi (Acknowledgments): Update.
* doc/emacs/emacs.texi (Acknowledgments): Add several names from
Author: headers.
Stefan Kangas [Thu, 1 Sep 2022 09:04:21 +0000 (11:04 +0200)]
Make some versions in docs match package version
* doc/emacs/misc.texi (Interactive Shell): Bump Emacs version.
* doc/misc/ediff.texi:
* doc/misc/flymake.texi:
* doc/misc/viper.texi: Fix version to match package.
* lisp/emulation/viper.el: Make version match variable.
Stefan Kangas [Thu, 1 Sep 2022 09:01:14 +0000 (11:01 +0200)]
Minor doc fix; improve sorting of VC backends
* doc/emacs/maintaining.texi (Version Control Systems): Minor doc fix;
rearrange list to put git, cvs and subversion at the top.
Eli Zaretskii [Thu, 1 Sep 2022 08:42:33 +0000 (11:42 +0300)]
Clarify the doc string of 'set-face-attribute'
* lisp/faces.el (set-face-attribute): Clarify the issue with
resetting attribute values to 'unspecified' for future frames.
(Bug#57499)
Stefan Kangas [Thu, 1 Sep 2022 03:10:19 +0000 (05:10 +0200)]
; Auto-commit of loaddefs files.
Gregory Heytings [Tue, 30 Aug 2022 21:03:01 +0000 (21:03 +0000)]
Enable 256 colors in fbterm.
* lisp/term/fbterm.el: New file.
* doc/misc/efaq.texi (Emacs in a Linux console): Document the TERM
environment variable with which the new file is used.
Eli Zaretskii [Tue, 30 Aug 2022 16:09:00 +0000 (19:09 +0300)]
One more fix for find-file.el
* lisp/find-file.el (ff-get-file-name): Use 'expand-file-name'
instead of 'concat', which doesn't DTRT with absolute file names.
(ff-other-file-alist): Yet another doc fix. (Bug#57325)
Eli Zaretskii [Tue, 30 Aug 2022 12:42:34 +0000 (15:42 +0300)]
; Yet another doc fix for 'ff-other-file-alist' (bug#57325)
Gregory Heytings [Mon, 29 Aug 2022 16:06:37 +0000 (16:06 +0000)]
Recommend using fbterm in the Linux console.
* doc/misc/efaq.texi (Emacs in a Linux console): New node.
(Common requests): Entry for the new node.
* etc/PROBLEMS (Linux console problems...): Mention the new FAQ node.
Eli Zaretskii [Mon, 29 Aug 2022 14:09:02 +0000 (17:09 +0300)]
; * src/window.c (syms_of_window) <window-point-insertion-type>: Doc fix.
Eli Zaretskii [Mon, 29 Aug 2022 14:02:46 +0000 (17:02 +0300)]
* lisp/find-file.el (ff-other-file-alist): Doc fix. (Bug#57325)
Eli Zaretskii [Sun, 28 Aug 2022 11:42:07 +0000 (14:42 +0300)]
* lisp/info.el (Info-mode): Support the Linux console better.
Eli Zaretskii [Sun, 28 Aug 2022 05:51:09 +0000 (08:51 +0300)]
; Fix doc strings in latin1-disp.el
* lisp/international/latin1-disp.el (latin1-display-ucs-per-lynx)
(latin1-display): Doc fix.
Eli Zaretskii [Sun, 28 Aug 2022 05:40:25 +0000 (08:40 +0300)]
Improve the documentation of glyphless-character display
* lisp/international/characters.el (glyphless-char-display-control):
* src/xdisp.c (syms_of_xdisp) <glyphless-char-display>: Mention
the 'glyphless-char' face in the doc string.
* doc/lispref/display.texi (Glyphless Chars): Index
'glyphless-char' face.
Eli Zaretskii [Sat, 27 Aug 2022 11:24:59 +0000 (14:24 +0300)]
; * lisp/jit-lock.el (jit-lock-chunk-size): Doc fix.
Eli Zaretskii [Sat, 27 Aug 2022 07:50:57 +0000 (10:50 +0300)]
Fix documentation of 'glyphless-char-display'
* src/xdisp.c (syms_of_xdisp)<glyphless-char-display>: Doc fix.
(gui_produce_glyphs, lookup_glyphless_char_display): Fix
indentation.
Eli Zaretskii [Thu, 25 Aug 2022 19:07:04 +0000 (22:07 +0300)]
; * etc/DEBUG: Fix wording of "X protocol errors" section.
Robert Pluim [Thu, 25 Aug 2022 16:13:16 +0000 (18:13 +0200)]
Treat smtp-auth method from auth-info as a symbol
The lookup of the SMTP auth method is done based on symbols, but
sometimes the requested value comes from `auth-info', in which case it
is a string, so call `intern-soft' to convert it to a symbol (which
does nothing if it's already a symbol).
* lisp/mail/smtpmail.el (smtpmail-try-auth-methods): Call
`intern-soft' on the smtp-auth key's value. (Bug#57373)
Do not merge to master
Stefan Kangas [Thu, 25 Aug 2022 15:15:39 +0000 (17:15 +0200)]
* lisp/wdired.el: Improve "Commentary" section.
Stefan Kangas [Thu, 25 Aug 2022 15:11:05 +0000 (17:11 +0200)]
* lisp/wdired.el: Doc fix; don't mention obsolete variable.
Stefan Kangas [Tue, 23 Aug 2022 14:18:57 +0000 (16:18 +0200)]
* lisp/progmodes/etags.el (next-file): Minor doc fix.
Andreas Schwab [Thu, 25 Aug 2022 07:51:40 +0000 (09:51 +0200)]
* configure.ac: Move AC_LANG_PUSH/POP out of AC_CACHE_CHECK. (Bug#57380)
(cherry picked from commit
ce82300221f270241fdda1f5dfb567bdb1208543 )
Stefan Kangas [Mon, 22 Aug 2022 14:30:29 +0000 (16:30 +0200)]
; * doc/misc/htmlfontify.texi: Fix version.
Kyle Meyer [Sun, 21 Aug 2022 21:25:39 +0000 (17:25 -0400)]
Update to Org 9.5.4-19-g4dff42
Stefan Kangas [Sun, 21 Aug 2022 20:31:05 +0000 (22:31 +0200)]
; * lisp/find-file.el (ff-other-file-alist): Fix typo.
Eli Zaretskii [Sun, 21 Aug 2022 19:06:34 +0000 (22:06 +0300)]
; * lisp/find-file.el (ff-other-file-alist): Another doc fix. (Bug#57325)
Eli Zaretskii [Sun, 21 Aug 2022 18:48:58 +0000 (21:48 +0300)]
* lisp/find-file.el (ff-other-file-alist): Doc fix. (Bug#57325)
Stefan Kangas [Fri, 19 Aug 2022 15:29:05 +0000 (17:29 +0200)]
Resurrect obsoletion warning for two functions
These were supposed to have been deleted, but never were. Resurrect
their obsoletion warning and let's delete them in Emacs 29 instead.
* lisp/subr.el (process-filter-multibyte-p)
(set-process-filter-multibyte): Resurrect obsoletion warning.
* etc/NEWS: Don't announce their deletion.
Alan Mackenzie [Fri, 19 Aug 2022 15:06:38 +0000 (15:06 +0000)]
* src/window.c (select_window): Fix assert for buffer = non-active minibuffer
Gerd Möllmann [Fri, 19 Aug 2022 08:52:52 +0000 (10:52 +0200)]
Find libgccjit on macOS with Homebrew differently
* configure.ac (MAC_LIBS): Find libgccjit's directory slightly
differently for brew installations.
Stefan Kangas [Thu, 18 Aug 2022 18:13:34 +0000 (20:13 +0200)]
Improve image-mode-as-hex docstring
* lisp/image-mode.el: Fix typos.
(image-mode-as-hex): Doc fix; say that it uses 'hexl-mode' and reflow.
Stefan Kangas [Thu, 18 Aug 2022 16:41:18 +0000 (18:41 +0200)]
* lisp/image-mode.el (image-mode-as-hex): Fix toggle instructions.
Stefan Kangas [Thu, 18 Aug 2022 15:50:13 +0000 (17:50 +0200)]
; lisp/image-mode.el: Fix typo.
Stefan Kangas [Thu, 18 Aug 2022 15:36:54 +0000 (17:36 +0200)]
* lisp/image-mode.el: Improve commentary.
Colin Woodbury [Thu, 18 Aug 2022 13:06:56 +0000 (15:06 +0200)]
cl-reduce doc string improvement
* lisp/emacs-lisp/cl-seq.el (cl-reduce): Explain what happens when
using :from-end (bug#57273).
Paul Eggert [Thu, 18 Aug 2022 03:30:26 +0000 (20:30 -0700)]
Backport tempname changes from master (bug#57129)
* lib/tempname.c: Backport from master, which uses current Gnulib.
Stefan Kangas [Tue, 16 Aug 2022 14:38:33 +0000 (16:38 +0200)]
; * lisp/vc/ediff.el: Improve wording in last change.
Stefan Kangas [Tue, 16 Aug 2022 11:38:22 +0000 (13:38 +0200)]
Revert "; * doc/lispintro/emacs-lisp-intro.texi: Fix typo."
This reverts commit
9d0dba44da7ac83d018fff3c26d33dac12ebd806 .
This was not a typo, but incorrectly matching parens in Info-mode.
Stefan Kangas [Tue, 16 Aug 2022 06:08:36 +0000 (08:08 +0200)]
* doc/misc/gnus.texi (Article Washing): Fix Links URL.
Stefan Kangas [Sun, 14 Aug 2022 14:43:58 +0000 (16:43 +0200)]
; * doc/lispintro/emacs-lisp-intro.texi: Fix typo.
Eli Zaretskii [Sun, 14 Aug 2022 05:51:44 +0000 (08:51 +0300)]
; Improve documentation of minibuffer history wrt completion
* doc/emacs/mini.texi (Minibuffer History): Mention explicitly
that minibuffer history is related also to completion candidates.
Improve indexing. (Bug#57163)
Stefan Kangas [Fri, 12 Aug 2022 15:48:30 +0000 (17:48 +0200)]
Delete references to deleted library hilit19.el
* doc/misc/gnus.texi (Compatibility):
* lisp/progmodes/f90.el:
* lisp/ps-print.el:
* lisp/vc/ediff.el: Delete references to hilit19.el.
Stefan Kangas [Fri, 12 Aug 2022 13:58:33 +0000 (15:58 +0200)]
Delete stale comments from Lisp Intro manual
* doc/lispintro/emacs-lisp-intro.texi (Args as Variable or List)
(print-elements-of-list, Miscellaneous): Delete some references to
Emacs 22.
Stefan Kangas [Fri, 12 Aug 2022 13:46:29 +0000 (15:46 +0200)]
; Delete redundant installation instructions from ebnf2ps.el
* lisp/progmodes/ebnf2ps.el: Delete redundant installation
instructions.
Stefan Kangas [Thu, 11 Aug 2022 13:16:31 +0000 (15:16 +0200)]
; * lisp/printing.el: Delete outdated download instructions.
Stefan Kangas [Thu, 11 Aug 2022 13:03:29 +0000 (15:03 +0200)]
Don't list Emacs as requirement for built-in package
* doc/misc/htmlfontify.texi (Requirements): Don't list Emacs as
requirement for built-in package.
YAMAMOTO Mitsuharu [Thu, 11 Aug 2022 09:16:24 +0000 (18:16 +0900)]
Fix wrong metrics for bitmap-only fonts with HarfBuzz 5
* src/ftcrfont.c (ftcrhbfont_begin_hb_font): Always use the standard
position unit value on HarfBuzz 5 and later regardless of whether the
font is bitmap-only or not. (Bug#57066)
Eli Zaretskii [Wed, 10 Aug 2022 11:57:07 +0000 (14:57 +0300)]
; Fix @setfilename in calc.texi
* doc/misc/calc.texi: Move the @setfilename command to its proper
place. (Bug#57107)
Stefan Kangas [Tue, 9 Aug 2022 20:35:35 +0000 (22:35 +0200)]
Improve wording when documenting other TRAMP syntaxes
* doc/misc/tramp.texi (Change file name syntax): Improve wording.
(Bug#57061)
Stefan Kangas [Tue, 9 Aug 2022 20:21:01 +0000 (22:21 +0200)]
; * doc/misc/viper.texi (Rudimentary Changes): Avoid alias.
Stefan Kangas [Mon, 8 Aug 2022 19:44:01 +0000 (21:44 +0200)]
* lisp/vc/diff-mode.el: Don't mention XEmacs.
Stefan Kangas [Mon, 8 Aug 2022 19:28:53 +0000 (21:28 +0200)]
Don't mention XEmacs toolbar in ediff manual
* doc/misc/ediff.texi (Other Session Commands): Don't mention XEmacs
specific toolbar support for now. This can be changed back once the
toolbar is ported to Emacs.
Eli Zaretskii [Sat, 6 Aug 2022 16:19:01 +0000 (19:19 +0300)]
* etc/PROBLEMS: Problems with Alacritty and Emoji. (Bug#56952)
YugaEgo [Sat, 6 Aug 2022 12:20:09 +0000 (15:20 +0300)]
Link from (emacs)Init Syntax to (elisp)Introduction
* doc/emacs/custom.texi (Init Syntax): Link to the ELisp manual (Bug#56870)
Stefan Kangas [Sat, 6 Aug 2022 12:26:07 +0000 (14:26 +0200)]
Don't mention removed XEmacs support in reftex manual
* doc/misc/reftex.texi (Installation, Imprint): Don't mention
removed XEmacs support.
Stefan Kangas [Sat, 6 Aug 2022 08:25:39 +0000 (10:25 +0200)]
Don't mention removed XEmacs support in idlwave manual
* doc/misc/idlwave.texi (Lesson I---Development Cycle)
(Syntax Highlighting, Windows and macOS, Troubleshooting): Delete
most references to XEmacs. Support for it was deleted in 28.1.
Eli Zaretskii [Sat, 6 Aug 2022 06:48:15 +0000 (09:48 +0300)]
; * admin/make-tarball.txt: Fix last change.
Eli Zaretskii [Sat, 6 Aug 2022 06:44:45 +0000 (09:44 +0300)]
; * lisp/play/fortune.el (fortune-ask-file): Doc fix.
Stefan Kangas [Tue, 26 Jul 2022 13:12:19 +0000 (15:12 +0200)]
* lisp/play/fortune.el: Doc fixes.
Stefan Kangas [Thu, 4 Aug 2022 12:58:08 +0000 (14:58 +0200)]
* doc/lispref/loading.texi (Autoload by Prefix): Fix typo.
Philipp Stephani [Tue, 26 Jul 2022 08:30:55 +0000 (10:30 +0200)]
* lisp/uniquify.el (uniquify-buffer-name-style): Quote apostrophe.
Stefan Kangas [Tue, 2 Aug 2022 15:18:22 +0000 (17:18 +0200)]
* lisp/term.el: Doc fix; don't mention rlogin.
Stefan Kangas [Tue, 2 Aug 2022 11:45:13 +0000 (13:45 +0200)]
; * admin/make-tarball.txt: Minor tweaks.
Stefan Kangas [Mon, 1 Aug 2022 16:13:13 +0000 (18:13 +0200)]
; Update ChangeLog and AUTHORS
* ChangeLog.3:
* etc/AUTHORS: Update.
Eli Zaretskii [Sun, 31 Jul 2022 15:05:09 +0000 (18:05 +0300)]
* src/lisp.h (CHECK_INTEGER): Fix the predicate. (Bug#56856)
Eli Zaretskii [Sat, 30 Jul 2022 16:34:38 +0000 (19:34 +0300)]
Improve documentation of column-related functions
* doc/lispref/text.texi (Primitive Indent, Columns):
* src/indent.c (Fcurrent_indentation, Fmove_to_column): Document
that column counting ignores invisible text. (Bug#56837)
YAMAMOTO Mitsuharu [Sat, 30 Jul 2022 08:21:54 +0000 (17:21 +0900)]
* src/macfont.m (macfont_open): Initialize font->space_width. (Bug#56808)
Eli Zaretskii [Sat, 30 Jul 2022 06:32:48 +0000 (09:32 +0300)]
Improve indexing of keymap variables
* doc/lispref/maps.texi (Standard Keymaps):
* doc/lispref/display.texi (Button Buffer Commands)
(Button Properties):
* doc/lispref/keymaps.texi (Translation Keymaps): Improve indexing
of keymaps. (Bug#56816)
Alan Mackenzie [Fri, 29 Jul 2022 20:18:58 +0000 (20:18 +0000)]
CC Mode: fontify variables/functions after line comments ending in spaces
* lisp/progmodes/cc-engine.el (c-forward-comment-minus-1): Take account of
spaces preceding a linefeed when scanning a putative line comment end.
Štěpán Němec [Fri, 29 Jul 2022 07:37:50 +0000 (09:37 +0200)]
; Correct the meaning of "cf." in tips.texi
Cf. e.g. https://en.wiktionary.org/wiki/cf.
* doc/lispref/tips.texi (Documentation Tips): Correct the meaning of
"cf.".
Stefan Kangas [Thu, 28 Jul 2022 11:31:43 +0000 (13:31 +0200)]
; Auto-commit of loaddefs files.
Eli Zaretskii [Thu, 28 Jul 2022 09:56:44 +0000 (12:56 +0300)]
; * doc/lispref/windows.texi (Window Sizes): Another typo. (Bug#56811)
Eli Zaretskii [Thu, 28 Jul 2022 09:29:07 +0000 (12:29 +0300)]
; * doc/lispref/windows.texi (Window Sizes): Fix a typo. (Bug#56811)
Stefan Kangas [Thu, 28 Jul 2022 09:20:47 +0000 (11:20 +0200)]
Bump Emacs version to 28.1.91
* README:
* configure.ac:
* msdos/sed2v2.inp:
* nt/README.W32: Bump Emacs version to 28.1.91.
Stefan Kangas [Thu, 28 Jul 2022 09:15:51 +0000 (11:15 +0200)]
Update ChangeLog and AUTHORS for 28.1.91 pretest
* ChangeLog.3:
* etc/AUTHORS: Update.
Stefan Kangas [Thu, 28 Jul 2022 09:07:27 +0000 (11:07 +0200)]
; * admin/authors.el (authors-aliases): Update.
Lars Ingebrigtsen [Fri, 3 Jun 2022 11:04:13 +0000 (13:04 +0200)]
Revert the `...' documentation back to actual usage
* doc/lispref/tips.texi (Documentation Tips): Document how `...'
is really used now (bug#55780). ‘...’ is not really used in the
Emacs sources.
(cherry picked from commit
1ed9c1c7f9fe32ff5123091033350beb1ccae4ca )
Eli Zaretskii [Thu, 28 Jul 2022 07:45:43 +0000 (10:45 +0300)]
; Improve documentation of 'file-name-with-extension'
* lisp/files.el (file-name-with-extension): Doc fix. (Bug#56809)
Paul Pogonyshev [Wed, 27 Jul 2022 19:20:55 +0000 (21:20 +0200)]
Release the desktop lock in 'kill-emacs-hook'
* lisp/desktop.el: Run 'desktop--on-kill' in 'kill-emacs-hook'.
(desktop--on-kill): New function, refactored from 'desktop-kill'.
(desktop-kill): Call 'desktop--on-kill'. (Bug#56800)
Arash Esbati [Wed, 27 Jul 2022 17:59:25 +0000 (19:59 +0200)]
; * doc/lispref/tips.texi (Documentation Tips): Fix typos. (Bug#56802)
Eli Zaretskii [Mon, 25 Jul 2022 18:59:55 +0000 (21:59 +0300)]
Avoid infloop in 'recenter'
* src/window.c (Frecenter): Avoid infinite loop in the minibuffer
under 'fido-vertical-mode'. (Bug#56765)
Eli Zaretskii [Mon, 25 Jul 2022 11:49:23 +0000 (14:49 +0300)]
Fix inaccuracies in "lax search" documentation
* doc/emacs/search.texi (Lax Search): Update the examples of
character folding in search. (Bug#56747)
Kyle Meyer [Sun, 24 Jul 2022 20:24:24 +0000 (16:24 -0400)]
Update to Org 9.5.4-17-g6e991f
Eugene Ha [Thu, 28 Apr 2022 21:48:38 +0000 (23:48 +0200)]
Find libgccjit.dylib on Homebrew Macos
* configure.ac: Also find libggcjit on Homebrew (bug#55173).
Copyright-paperwork-exempt: yes
(cherry picked from commit
faa29fa2c9e9d5a5d7544a1a39b2a89cf57a8439 )
Michael Albinus [Sat, 23 Jul 2022 17:45:24 +0000 (19:45 +0200)]
Set `default-directory' of Tramp archive connection buffer
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
Set `default-directory' of Tramp connection buffer. (Bug#56628)
Eli Zaretskii [Sat, 23 Jul 2022 09:56:00 +0000 (12:56 +0300)]
; * doc/lispref/functions.texi (Declare Form): Fix typo.
Eli Zaretskii [Sat, 23 Jul 2022 09:54:07 +0000 (12:54 +0300)]
Update the documentation of 'declare' forms
* doc/lispref/compile.texi (Native-Compilation Variables): Mention
the 'declare' alternative for 'native-comp-speed'.
* doc/lispref/functions.texi (Declare Form): Document 'declare'
forms that were previously undocumented.
Eli Zaretskii [Sat, 23 Jul 2022 08:11:47 +0000 (11:11 +0300)]
Fix bookmark support for Help functions in native-compilation builds
* lisp/help.el (describe-key--helper, describe-function--helper):
New helper functions.
(describe-key): Call 'describe-key--helper' instead of a
lambda-function.
* lisp/help-fns.el (describe-function): Call
'describe-function--helper' instead of a lambda-function.
(Bug#56643)
Miha Rihtarsic [Sat, 23 Jul 2022 07:32:50 +0000 (10:32 +0300)]
Fix mode line mouse-1 binding when showing only column numbers
* lisp/bindings.el (mode-line-position): Fix the mouse-1 binding
when showing only column numbers (bug#56694). Do not merge to
master.