diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/ChangeLog.5 | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/ChangeLog.5')
| -rw-r--r-- | src/ChangeLog.5 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 1f21e9fb99c..c6dfde7496b 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -3463,7 +3463,7 @@ | |||
| 3463 | 3463 | ||
| 3464 | * lisp.h (running_asynch_code): New global flag. | 3464 | * lisp.h (running_asynch_code): New global flag. |
| 3465 | * emacs.c (running_asynch_code): New global flag. | 3465 | * emacs.c (running_asynch_code): New global flag. |
| 3466 | (main): Initialise it. | 3466 | (main): Initialize it. |
| 3467 | * process.c (read_process_output, exec_sentinel): Set and | 3467 | * process.c (read_process_output, exec_sentinel): Set and |
| 3468 | reset the running_asynch_code global flag and restore match data. | 3468 | reset the running_asynch_code global flag and restore match data. |
| 3469 | 3469 | ||
| @@ -7148,7 +7148,7 @@ See ChangeLog.4 for earlier changes. | |||
| 7148 | ;; coding: utf-8 | 7148 | ;; coding: utf-8 |
| 7149 | ;; End: | 7149 | ;; End: |
| 7150 | 7150 | ||
| 7151 | Copyright (C) 1994-1995, 2001-2011 Free Software Foundation, Inc. | 7151 | Copyright (C) 1994-1995, 2001-2012 Free Software Foundation, Inc. |
| 7152 | 7152 | ||
| 7153 | This file is part of GNU Emacs. | 7153 | This file is part of GNU Emacs. |
| 7154 | 7154 | ||