aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-02 05:59:46 +0200
committerJuanma Barranquero2013-06-02 05:59:46 +0200
commit8a621d5317e94977bb3e5e5ab2800b810d0297ee (patch)
tree4ae7edf270362f8c5f0c3d0e41e2289bdd3b4a19
parent2044e704a47b356e39b7a176eb53b5ef5deb5199 (diff)
downloademacs-8a621d5317e94977bb3e5e5ab2800b810d0297ee.tar.gz
emacs-8a621d5317e94977bb3e5e5ab2800b810d0297ee.zip
lisp/ChangeLog, src/ChangeLog: Fix whitespace.
-rw-r--r--lisp/ChangeLog13
-rw-r--r--src/ChangeLog4
2 files changed, 8 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56c340b1da4..4a2fb7cc1cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1704,7 +1704,7 @@
1704 1704
1705 * emacs-lisp/syntax.el (syntax-propertize-multiline): 1705 * emacs-lisp/syntax.el (syntax-propertize-multiline):
1706 Use `syntax-multiline' text property consistently instead of 1706 Use `syntax-multiline' text property consistently instead of
1707 `font-lock-multiline'. (bug#14237). 1707 `font-lock-multiline'. (Bug#14237)
1708 1708
17092013-04-26 Glenn Morris <rgm@gnu.org> 17092013-04-26 Glenn Morris <rgm@gnu.org>
1710 1710
@@ -1945,9 +1945,9 @@
19452013-04-19 Masatake YAMATO <yamato@redhat.com> 19452013-04-19 Masatake YAMATO <yamato@redhat.com>
1946 1946
1947 * progmodes/sh-script.el (sh-imenu-generic-expression): 1947 * progmodes/sh-script.el (sh-imenu-generic-expression):
1948 Handle function names with a single character. (Bug#14111) 1948 Handle function names with a single character. (Bug#14111)
1949 1949
19502013-04-19 Dima Kogan <dima@secretsauce.net> (tiny change) 19502013-04-19 Dima Kogan <dima@secretsauce.net> (tiny change)
1951 1951
1952 * progmodes/gud.el (gud-perldb-marker-filter): Understand position info 1952 * progmodes/gud.el (gud-perldb-marker-filter): Understand position info
1953 for subroutines defined in an eval (bug#14182). 1953 for subroutines defined in an eval (bug#14182).
@@ -2364,9 +2364,8 @@
2364 2364
23652013-04-03 Alan Mackenzie <acm@muc.de> 23652013-04-03 Alan Mackenzie <acm@muc.de>
2366 2366
2367 Handle `parse-partial-sexp' landing inside a comment opener 2367 Handle `parse-partial-sexp' landing inside a comment opener (Bug#13244).
2368 (Bug#13244). Also adapt to the new values of element 7 of a parse 2368 Also adapt to the new values of element 7 of a parse state.
2369 state.
2370 2369
2371 * progmodes/cc-engine.el (c-state-pp-to-literal): New optional 2370 * progmodes/cc-engine.el (c-state-pp-to-literal): New optional
2372 parameter `not-in-delimiter'. Handle being inside comment opener. 2371 parameter `not-in-delimiter'. Handle being inside comment opener.
@@ -3002,7 +3001,7 @@
30022013-03-08 Jambunathan K <kjambunathan@gmail.com> 30012013-03-08 Jambunathan K <kjambunathan@gmail.com>
3003 3002
3004 * hi-lock.el (hi-lock-read-regexp-defaults-function): New var. 3003 * hi-lock.el (hi-lock-read-regexp-defaults-function): New var.
3005 (hi-lock-read-regexp-defaults): New defun. 3004 (hi-lock-read-regexp-defaults): New defun.
3006 (hi-lock-line-face-buffer, hi-lock-face-buffer) 3005 (hi-lock-line-face-buffer, hi-lock-face-buffer)
3007 (hi-lock-face-phrase-buffer): Propagate above change. 3006 (hi-lock-face-phrase-buffer): Propagate above change.
3008 Update docstring (bug#13892). 3007 Update docstring (bug#13892).
diff --git a/src/ChangeLog b/src/ChangeLog
index a2d4a21e973..65a49bae1dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3553,7 +3553,7 @@
3553 Use xputenv instead of setenv or putenv, to detect memory exhaustion. 3553 Use xputenv instead of setenv or putenv, to detect memory exhaustion.
3554 * editfns.c (initial_tz): Move static var decl up. 3554 * editfns.c (initial_tz): Move static var decl up.
3555 (tzvalbuf_in_environ): New static var. 3555 (tzvalbuf_in_environ): New static var.
3556 (init_editfns): Initialize these two static vars. 3556 (init_editfns): Initialize these two static vars.
3557 (Fencode_time): Don't assume arbitrary limit on EMACS_INT width. 3557 (Fencode_time): Don't assume arbitrary limit on EMACS_INT width.
3558 Save old TZ value on stack, if it's small. 3558 Save old TZ value on stack, if it's small.
3559 (Fencode_time, set_time_zone_rule): Don't modify 'environ' directly; 3559 (Fencode_time, set_time_zone_rule): Don't modify 'environ' directly;
@@ -3832,7 +3832,7 @@
3832 Use execve to avoid need to munge environ (Bug#13054). 3832 Use execve to avoid need to munge environ (Bug#13054).
3833 * callproc.c (Fcall_process): 3833 * callproc.c (Fcall_process):
3834 * process.c (create_process): 3834 * process.c (create_process):
3835 Don't save and restore environ; no longer needed. 3835 Don't save and restore environ; no longer needed.
3836 * callproc.c (child_setup): 3836 * callproc.c (child_setup):
3837 Use execve, not execvp, to preserve environ. 3837 Use execve, not execvp, to preserve environ.
3838 3838