]> code.delx.au - gnu-emacs/commitdiff
Merge from emacs-24; up to 2014-07-27T18:05:37Z!eliz@gnu.org
authorGlenn Morris <rgm@gnu.org>
Thu, 16 Oct 2014 01:49:34 +0000 (21:49 -0400)
committerGlenn Morris <rgm@gnu.org>
Thu, 16 Oct 2014 01:49:34 +0000 (21:49 -0400)
1  2 
lisp/ChangeLog
lisp/ChangeLog.16

diff --cc lisp/ChangeLog
index cf83767b924167351a4acfe4e948055bc97a63da,6b0c8a67b796be091fa3d1b48a2260241d2f43ca..13e161e03b7d46c7680163ed66c097c080530b95
@@@ -1,26 -1,16 +1,33 @@@
 -2014-10-15  Alan Mackenzie  <acm@muc.de>
++2014-10-16  Alan Mackenzie  <acm@muc.de>
+       * cus-edit.el (custom-command-apply): Specify the return value in
+       the doc string.
+       (Custom-reset-standard): Save custom-file (e.g. .emacs) only when
+       custom-command-apply has returned non-nil.
  2014-10-15  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -      * emacs-lisp/lisp.el (lisp--local-variables-1): Handle `quote'.
 -      Backported (bug#18688).
 +      * emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.
 +      Remove incorrect handling of eldoc-print-after-edit.
 +      (eldoc-message-commands, eldoc-last-data): Use defvar.
 +      * loadup.el (emacs-lisp/eldoc): Load it.
  
 -2014-10-14  Eli Zaretskii  <eliz@gnu.org>
 +      * progmodes/m4-mode.el (m4-syntax-propertize): New var.
 +      (m4-mode): Use it.
 +      (m4--quoted-p): New function.
 +      (m4-font-lock-keywords): Don't handle #..\n comments any more.
 +      (m4-mode-syntax-table): Use punctuation syntax (according to m4 manual)
 +      for most special characters.
 +
 +      * progmodes/compile.el (compilation--previous-directory): Simplify.
 +      (compilation-next-error): Ensure the parse before we look at
 +      compilation-message property.
 +
 +2014-10-15  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * simple.el (what-cursor-position):
 +      * descr-text.el (describe-char): Update to support the new bidi
 +      characters.
  
        * emacs-lisp/tabulated-list.el (tabulated-list-mode):
        Force bidi-paragraph-direction to 'left-to-right'.  This fixes
Simple merge