upstream + xwidget-webkit-show-named-element

1 files changed, 34 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index abae693d0c8..471b1219c19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2011-10-17  Ryan Barrett <emacs@ryanb.org>  (tiny change)
+
+        * dirtrack.el (dirtrack): Support shell buffers with path
+        prefixes, e.g. tramp-based remote shells.  (Bug#9647)
+
+2011-10-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * json.el: Bump version to 1.3 and note change in History.
+        (json-alist-p, json-plist-p): Rewrite to avoid recursion.
+
+2011-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * comint.el (comint-insert-input, comint-send-input)
+        (comint-get-old-input-default, comint-backward-matching-input)
+        (comint-next-prompt): Use nil instead of `input' for field property of
+        past user input (bug#114).
+
+        * minibuffer.el (completion--replace): Inherit surrounding properties
+        (bug#114).
+        (minibuffer-complete-and-exit): Use it.
+
+        * comint.el (comint--table-subvert): Quote the all-completions output
+        (bug#9160).
+
+2011-10-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * ido.el (ido-default-buffer-method): Remove redundant :type entry.
+
+        * menu-bar.el (menu-bar-file-menu): Add entry for making new
+        window on right of selected.  (Bug#9350) Reword other window
+        entries and separate them from frame entries.
+
 2011-10-15  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/ert.el (ert--explain-equal-rec, ert-select-tests):
@@ -5,8 +37,8 @@
 
 2011-10-15  Chong Yidong  <cyd@stupidchicken.com>
 
-        * net/network-stream.el (network-stream-open-starttls): Improve
-        detection of failure due to lack of TLS support.
+        * net/network-stream.el (network-stream-open-starttls):
+        Improve detection of failure due to lack of TLS support.
 
         * mail/sendmail.el (sendmail-query-once): Tweak prompt message,
         putting the input text in front and in bold.