upstream

1 files changed, 110 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d532ba899f..5b709c76c74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,111 @@
+2012-10-24  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/easymenu.el (easy-menu-define): Doc fix (Bug#12628).
+
+2012-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion--all-sorted-completions-location): New var.
+        (completion--cache-all-sorted-completions)
+        (completion--flush-all-sorted-completions): Use it.
+        (completion-in-region, completion-in-region--postch)
+        (completion-at-point, completion-help-at-point): Use markers in
+        completion-in-region--data (bug#12619).
+
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-start): Try to handle common
+        quoting of `cd' argument (bug#12640).
+
+        * vc/diff-mode.el (diff-hunk): `save-excursion' while refining
+        (bug#12671).
+
+2012-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/gud.el (gud-menu-map):
+        Check gdb-active-process is bound.  (Bug#12358)
+
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * repeat.el (repeat): Set real-this-command (bug#12232).
+
+        * htmlfontify.el (hfy-post-html-hook):
+        * filesets.el (filesets-cache-fill-content-hook):
+        * arc-mode.el (archive-extract-hook):
+        * progmodes/cc-mode.el (c-prepare-bug-report-hook):
+        * net/rcirc.el (rcirc-sentinel-functions)
+        (rcirc-receive-message-functions, rcirc-activity-functions)
+        (rcirc-print-functions):
+        * net/dbus.el (dbus-event-error-functions):
+        * emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
+        * emacs-lisp/checkdoc.el (checkdoc-style-functions)
+        (checkdoc-comment-style-functions): Don't use "-hooks" suffix.
+        * term/sun.el (sun-raw-prefix-hooks):
+        * mail/sendmail.el (mail-yank-hooks): Use make-obsolete-variable.
+
+2012-10-23  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-smb.el (tramp-smb-maybe-open-connection):
+        Set `tramp-chunksize' to 1.  This improves the performance.
+        (tramp-smb-wait-for-output): Add timeout to
+        `tramp-accept-process-output' calls.
+
+2012-10-23  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (font-list-limit): Define as an obsolete variable.
+
+        * startup.el (command-line):
+        * cus-start.el: Don't refer to font-list-limit.
+
+        * newcomment.el (comment-normalize-vars): Doc fix (Bug#12583).
+
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (internal-temp-output-buffer-show): Rename from
+        temp-output-buffer-show, since previously compiled files expect this name.
+
+2012-10-23  Glenn Morris  <rgm@gnu.org>
+
+        * image.el (image-type-from-file-name): If multiple types match,
+        return the first one that is supported.  (Bug#9045)
+
+2012-10-22  Glenn Morris  <rgm@gnu.org>
+
+        * image.el (imagemagick-enabled-types): Doc fix.
+
+2012-10-22  Takafumi Arakaki  <aka.tkf@gmail.com>  (tiny change)
+
+        * progmodes/which-func.el (which-func-current): The hash-table may have
+        an explicit nil (bug#12338).
+
+2012-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-pair-delete-selection-self-insert-function):
+        Rename to electric-pair-will-use-region, return a boolean.
+        (electric-pair-mode): Adjust accordingly.  Don't require delsel.
+
+        * delsel.el (delete-selection-helper): Use a function instead of a hook.
+        (delete-selection-pre-hook): Use use-region-p.
+        (delete-selection-self-insert-function): Remove.
+        (self-insert-command): Obey self-insert-uses-region-functions.
+        (self-insert-iso): Revert to previous setting, since we don't actually
+        know what that command does.
+        (delete-selection-self-insert-hooks): Remove.
+
+2012-10-22  Simon Law  <sfllaw@sfllaw.ca>  (tiny change)
+
+        * delsel.el (delete-selection-helper): New function, extracted from
+        delete-selection-pre-hook.
+        (delete-selection-pre-hook): Use it.
+        (delete-selection-self-insert-function): New function.
+        (delete-selection-self-insert-hooks): New hook.
+        (self-insert-command, self-insert-iso): Use it.
+        * electric.el (electric-pair-syntax): New function, extracted from
+        electric-pair-post-self-insert-function.
+        (electric-pair-post-self-insert-function): Use it.
+        (electric-pair-delete-selection-self-insert-function): New function.
+        (electric-pair-mode): Require delsel and setup
+        delete-selection-self-insert-hooks (bug#11520).
+
 2012-10-20  Chong Yidong  <cyd@gnu.org>
 
         * vc/vc.el (vc-diff-internal): Set up Diff mode even if there are
@@ -8,8 +116,8 @@
 
 2012-10-20  Arne Jørgensen  <arne@arnested.dk>
 
-        * progmodes/flymake.el (flymake-create-temp-inplace): Use
-        file-truename.
+        * progmodes/flymake.el (flymake-create-temp-inplace):
+        Use file-truename.
 
 2012-10-20  Eli Zaretskii  <eliz@gnu.org>