Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

5 files changed, 23 insertions, 14 deletions

diff --git a/etc/NEWS b/etc/NEWS
index cb34e9b4613..ecbbf747713 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -51,7 +51,7 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
 
 ** C-h l now also lists the commands that were run.
 
-** The new M-s M-s key binding uses eww to search the web for the
+** The new M-s M-w key binding uses eww to search the web for the
 text in the region.
 
 ** M-x suggests shorthands and ignores obsolete commands for completion.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b232210f3c7..a4dec7af492 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,10 @@
         (icalendar--create-ical-alarm, icalendar--do-create-ical-alarm):
         New functions for exporting alarms.
 
+2014-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * bindings.el (search-map): Move `eww-search-words' to `M-s M-w'.
+
 2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port new time stamp handling to old Emacs and to XEmacs.
@@ -112,7 +116,7 @@
         * progmodes/python.el (python-indent-region):
         Use python-indent-line and skip special cases.  (Bug#18843)
 
-2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+2014-11-16  Peder O. Klingenberg  <peder@klingenberg.no>
 
         * mail/emacsbug.el (report-emacs-bug): Make a better guess at
           envelope-from when reporting through sendmail (bug#19054).
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 46ff522c731..110774082e0 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -926,7 +926,7 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key esc-map "s" search-map)
 
 (define-key search-map "o"    'occur)
-(define-key search-map "\M-s" 'eww-search-words)
+(define-key search-map "\M-w" 'eww-search-words)
 (define-key search-map "hr"   'highlight-regexp)
 (define-key search-map "hp"   'highlight-phrase)
 (define-key search-map "hl"   'highlight-lines-matching-regexp)
diff --git a/test/ChangeLog b/test/ChangeLog
index 6e350cf8ec1..2dfd5151f09 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * automated/occur-tests.el (occur-test-case, occur-test-create):
+        In case of failure, show the actual string, rather than just nil.
+        (occur-tests): Update for apparent change in output re control-chars.
+
 2014-11-17  Ulf Jasper  <ulf.jasper@web.de>
 
         * automated/icalendar-tests.el (icalendar-tests--test-export): New
diff --git a/test/automated/occur-tests.el b/test/automated/occur-tests.el
index b15e3dc9933..5b90dab494c 100644
--- a/test/automated/occur-tests.el
+++ b/test/automated/occur-tests.el
@@ -52,7 +52,7 @@ a
 a
 a
 " "\
-2 matches for \"a^Ja\" in buffer:  *test-occur*
+2 matches for \"a\na\" in buffer:  *test-occur*
       1:a
        :a
       3:a
@@ -68,7 +68,7 @@ c
 a
 b
 " "\
-2 matches for \"a^Jb\" in buffer:  *test-occur*
+2 matches for \"a\nb\" in buffer:  *test-occur*
       1:a
        :b
       4:a
@@ -82,7 +82,7 @@ c
 a
 
 " "\
-2 matches for \"a^J\" in buffer:  *test-occur*
+2 matches for \"a\n\" in buffer:  *test-occur*
       1:a
        :
       4:a
@@ -97,7 +97,7 @@ d
 ex
 fx
 " "\
-2 matches for \"x^J.x^J\" in buffer:  *test-occur*
+2 matches for \"x\n.x\n\" in buffer:  *test-occur*
       1:ax
        :bx
        :c
@@ -232,7 +232,7 @@ i
 jx
 kx
 " "\
-3 matches for \"x^J.x\" in buffer:  *test-occur*
+3 matches for \"x\n.x\" in buffer:  *test-occur*
       1:ax
        :bx
        :c
@@ -256,7 +256,7 @@ f
 gx
 hx
 " "\
-2 matches for \"x^J.x\" in buffer:  *test-occur*
+2 matches for \"x\n.x\" in buffer:  *test-occur*
       1:ax
        :bx
        :c
@@ -321,7 +321,6 @@ Each element has the format:
   (let ((regexp (nth 0 test))
         (nlines (nth 1 test))
         (input-buffer-string (nth 2 test))
-        (output-buffer-string (nth 3 test))
         (temp-buffer (get-buffer-create " *test-occur*")))
     (unwind-protect
         (save-window-excursion
@@ -329,9 +328,8 @@ Each element has the format:
             (erase-buffer)
             (insert input-buffer-string)
             (occur regexp nlines)
-            (equal output-buffer-string
-                   (with-current-buffer "*Occur*"
-                     (buffer-string)))))
+            (with-current-buffer "*Occur*"
+              (buffer-substring-no-properties (point-min) (point-max)))))
       (and (buffer-name temp-buffer)
            (kill-buffer temp-buffer)))))
 
@@ -343,7 +341,8 @@ Each element has the format:
      `(ert-deftest ,testname ()
         ,testdoc
         (let (occur-hook)
-          (should (occur-test-case (nth ,n occur-tests))))))))
+          (should (equal (occur-test-case (nth ,n occur-tests))
+                         (nth 3 (nth ,n occur-tests)))))))))
 
 (dotimes (i (length occur-tests))
   (occur-test-create i))