Merge from trunk.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bde9d54cfa24b925e4fd67cae155e9f2b6ea20e3..07f45b34a54b2c5780305ed63bac1e7e8f8751db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * startup.el (argi): Declare as global variable (bug#9275).
+
+2011-08-12  Chong Yidong  <cyd@stupidchicken.com>
+
+       * subr.el (string-mark-left-to-right): Search the entire string
+       for RTL script, not just the terminating character.  Doc fix.
+
 2011-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/js.el (js-syntax-propertize, js-syntax-propertize-regexp):