diff options
| author | Bill Wohler | 2014-02-23 18:04:35 -0800 |
|---|---|---|
| committer | Bill Wohler | 2014-02-23 18:04:35 -0800 |
| commit | 3e93bafb95608467e438ba7f725fd1f020669f8c (patch) | |
| tree | f2f90109f283e06a18caea3cb2a2623abcfb3a92 /src/ChangeLog.2 | |
| parent | 791c0d7634e44bb92ca85af605be84ff2ae08963 (diff) | |
| parent | e918e27fdf331e89268fc2c9d7cf838d3ecf7aa7 (diff) | |
| download | emacs-3e93bafb95608467e438ba7f725fd1f020669f8c.tar.gz emacs-3e93bafb95608467e438ba7f725fd1f020669f8c.zip | |
Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 64e793c763c..c852328d61a 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -3961,7 +3961,7 @@ | |||
| 3961 | 3961 | ||
| 3962 | 1986-09-01 Richard M. Stallman (rms@prep) | 3962 | 1986-09-01 Richard M. Stallman (rms@prep) |
| 3963 | 3963 | ||
| 3964 | * xterm.c/xfns.c: Many changes from rlk, | 3964 | * xterm.c, xfns.c: Many changes from rlk, |
| 3965 | including using sigblock/sigsetmask to block signals | 3965 | including using sigblock/sigsetmask to block signals |
| 3966 | instead of turning handler off and on. | 3966 | instead of turning handler off and on. |
| 3967 | 3967 | ||
| @@ -4131,7 +4131,7 @@ | |||
| 4131 | and DEFVAR_PER_BUFFER. They expand into calls to | 4131 | and DEFVAR_PER_BUFFER. They expand into calls to |
| 4132 | defvar_lisp, etc. | 4132 | defvar_lisp, etc. |
| 4133 | 4133 | ||
| 4134 | * all .c files: | 4134 | * All .c files: |
| 4135 | All Def...Var renamed to DEFVAR... in syms_of_.... | 4135 | All Def...Var renamed to DEFVAR... in syms_of_.... |
| 4136 | 4136 | ||
| 4137 | * doc.c (FSnarf_documentation): Understand new DOC format | 4137 | * doc.c (FSnarf_documentation): Understand new DOC format |
| @@ -4771,7 +4771,7 @@ | |||
| 4771 | 4771 | ||
| 4772 | See ChangeLog.1 for earlier changes. | 4772 | See ChangeLog.1 for earlier changes. |
| 4773 | 4773 | ||
| 4774 | Copyright (C) 1986-1988, 2001-2013 Free Software Foundation, Inc. | 4774 | Copyright (C) 1986-1988, 2001-2014 Free Software Foundation, Inc. |
| 4775 | 4775 | ||
| 4776 | This file is part of GNU Emacs. | 4776 | This file is part of GNU Emacs. |
| 4777 | 4777 | ||