Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6242426..340dc41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,39 @@
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+       * subr.el (read-number): Once more use `read' rather than
+       `string-to-number', to trap non-numeric input.  (Bug#14254)
+
+2013-04-26  Erik Charlebois  <erikcharlebois@gmail.com>
+
+       * emacs-lisp/syntax.el (syntax-propertize-multiline):
+       Use `syntax-multiline' text property consistently instead of
+       `font-lock-multiline'. (bug#14237).
+
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/shadow.el (list-load-path-shadows):
+       No longer necessary to check for duplicate simple.el, since
+       2012-07-07 change to init_lread to not include installation lisp
+       directories in load-path when running uninstalled.  (Bug#14270)
+
+2013-04-26  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/octave.el (octave-submit-bug-report): Obsolete.
+       (octave-mode, inferior-octave-mode): Use setq-local.
+       (octave-not-in-string-or-comment-p): Renamed to
+       octave-in-string-or-comment-p.
+       (octave-in-comment-p, octave-in-string-p)
+       (octave-in-string-or-comment-p): Replace defsubst with defun.
+
+2013-04-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (distclean): Remove $(lisp)/loaddefs.el~.
+
+2013-04-25  Bastien Guerry  <bzg@gnu.org>
+
+       * textmodes/remember.el (remember-data-directory)
+       (remember-directory-file-name-format): Fix custom types.
+
 2013-04-25  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (octave-completion-at-point-function): Make