aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2014-03-18 02:13:00 +0100
committerJuanma Barranquero2014-03-18 02:13:00 +0100
commit07f44fdbfe0060781773f04867cfe1e1a1411f83 (patch)
treece46e39416cd9e5de240276af2b5ce26d8a9dd3f
parentad97cc28d1420acf2b5537724bdc8a82745de8b6 (diff)
downloademacs-07f44fdbfe0060781773f04867cfe1e1a1411f83.tar.gz
emacs-07f44fdbfe0060781773f04867cfe1e1a1411f83.zip
lisp/ChangeLog: Move up misplaced entry.
lisp/org/ChangeLog: Fix typo.
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/org/ChangeLog2
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f25ebb2e6e..69419a3d1ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12014-03-17 Stefan <monnier@iro.umontreal.ca> 12014-03-18 Daniel Colascione <dancol@dancol.org>
2
3 * startup.el (tty-handle-args): Remove debug message from 2007.
4
52014-03-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/nadvice.el (advice--interactive-form): New function. 7 * emacs-lisp/nadvice.el (advice--interactive-form): New function.
4 (advice--make-interactive-form): Use it to avoid (auto)loading function. 8 (advice--make-interactive-form): Use it to avoid (auto)loading function.
@@ -67,10 +71,6 @@
67 (rst-uncomment-region, rst-font-lock-find-unindented-line-match) 71 (rst-uncomment-region, rst-font-lock-find-unindented-line-match)
68 (rst-font-lock-handle-adornment-matcher): Mark unused arguments. 72 (rst-font-lock-handle-adornment-matcher): Mark unused arguments.
69 73
702014-03-18 Daniel Colascione <dancol@dancol.org>
71
72 * startup.el (tty-handle-args): Remove debug message from 2007.
73
742014-03-15 Juanma Barranquero <lekktu@gmail.com> 742014-03-15 Juanma Barranquero <lekktu@gmail.com>
75 75
76 * term/ns-win.el (x-command-line-resources): Rename from ns-... version, 76 * term/ns-win.el (x-command-line-resources): Rename from ns-... version,
@@ -163,8 +163,8 @@
163 163
1642014-03-13 Dmitry Gutov <dgutov@yandex.ru> 1642014-03-13 Dmitry Gutov <dgutov@yandex.ru>
165 165
166 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Fontify 166 * progmodes/ruby-mode.el (ruby-font-lock-keywords):
167 multiple adjacent negation chars. (Bug#17004) 167 Fontify multiple adjacent negation chars. (Bug#17004)
168 168
1692014-03-13 Tom Willemse <tom@ryuslash.org> (tiny change) 1692014-03-13 Tom Willemse <tom@ryuslash.org> (tiny change)
170 170
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ebc7799a9a6..0995f903957 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -8620,7 +8620,7 @@
8620 (org-agenda-run-series): Remove any old agenda markers in the 8620 (org-agenda-run-series): Remove any old agenda markers in the
8621 buffer that is going to take the new block agenda. 8621 buffer that is going to take the new block agenda.
8622 (org-prepare-agenda): Reset markers before erasing the buffer anc 8622 (org-prepare-agenda): Reset markers before erasing the buffer anc
8623 running `org-agenda-mode', because after that hte local variable 8623 running `org-agenda-mode', because after that the local variable
8624 `org-agenda-markers' will have gone away. 8624 `org-agenda-markers' will have gone away.
8625 (org-agenda-Quit): 8625 (org-agenda-Quit):
8626 (org-finalize-agenda): Install the marker resetter into the 8626 (org-finalize-agenda): Install the marker resetter into the