auto upstream

1 files changed, 69 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bce53d7caf..e7c374e1e96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,72 @@
+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
+        use of inferior octave process.
+        (octave-initialize-completions): Remove.
+        (inferior-octave-completion-table): New function.
+        (inferior-octave-completion-at-point): Use it.
+        (octave-completion-alist): Remove.
+
+2013-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/opascal.el: Use font-lock and syntax-propertize.
+        (opascal-mode-syntax-table): New var.
+        (opascal-literal-kind, opascal-is-literal-end)
+        (opascal-literal-token-at): Rewrite.
+        (opascal--literal-start-re, opascal-font-lock-keywords)
+        (opascal--syntax-propertize): New constants.
+        (opascal-font-lock-defaults): Adjust.
+        (opascal-mode): Use them.  Set comment-<foo> variables as well.
+        (delphi-comment-face, opascal-comment-face, delphi-string-face)
+        (opascal-string-face, delphi-keyword-face, opascal-keyword-face)
+        (delphi-other-face, opascal-other-face): Remove face variables.
+        (opascal-save-state): Remove macro.
+        (opascal-fontifying-progress-step): Remove constant.
+        (opascal--ignore-changes): Remove var.
+        (opascal-set-token-property, opascal-parse-next-literal)
+        (opascal-is-stable-literal, opascal-complete-literal)
+        (opascal-is-literal-start, opascal-face-of)
+        (opascal-parse-region, opascal-parse-region-until-stable)
+        (opascal-fontify-region, opascal-after-change)
+        (opascal-debug-show-is-stable, opascal-debug-unparse-buffer)
+        (opascal-debug-parse-region, opascal-debug-parse-window)
+        (opascal-debug-parse-buffer, opascal-debug-fontify-window)
+        (opascal-debug-fontify-buffer): Remove.
+        (opascal-debug-mode-map): Adjust accordingly.
+
+2013-04-25  Leo Liu  <sdl.web@gmail.com>
+
+        Merge octave-mod.el and octave-inf.el into octave.el with some
+        cleanups.
+        * progmodes/octave.el: New file renamed from octave-mod.el.
+        * progmodes/octave-inf.el: Merged into octave.el.
+        * progmodes/octave-mod.el: Renamed to octave.el.
+
+2013-04-25  Tassilo Horn  <tsdh@gnu.org>
+
+        * textmodes/reftex-vars.el
+        (reftex-label-ignored-macros-and-environments): New defcustom.
+
+        * textmodes/reftex-parse.el (reftex-parse-from-file): Use it.
+
 2013-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB.