Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org

4 files changed, 64 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 29e299e5eaa..5cb8aae8c1f 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,17 @@
+2014-05-08  Glenn Morris  <rgm@gnu.org>
+
+        * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
+        (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging.
+
+2014-05-08  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el (ruby-interpolation-after-dollar-sign):
+        New test.
+
+2014-05-08  Glenn Morris  <rgm@gnu.org>
+
+        * automated/help-fns.el: New file.
+
 2014-05-01  Barry O'Reilly  <gundaetiapo@gmail.com>
 
         * automated/undo-tests.el (undo-test-region-deletion): New test to
diff --git a/test/automated/help-fns.el b/test/automated/help-fns.el
new file mode 100644
index 00000000000..153de7f9e30
--- /dev/null
+++ b/test/automated/help-fns.el
@@ -0,0 +1,37 @@
+;;; help-fns.el --- tests for help-fns.el
+
+;; Copyright (C) 2014 Free Software Foundation, Inc.
+
+;; Maintainer: emacs-devel@gnu.org
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+
+(autoload 'help-fns-test--macro "help-fns" nil nil t)
+
+(ert-deftest help-fns-test-bug17410 ()
+  "Test for http://debbugs.gnu.org/17410 ."
+  (describe-function 'help-fns-test--macro)
+  (with-current-buffer "*Help*"
+    (goto-char (point-min))
+    (should (search-forward "autoloaded Lisp macro" (line-end-position)))))
+
+;;; help-fns.el ends here
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index f6fddb5ef4c..0ad5650cd77 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -452,6 +452,10 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-assert-face "%w{foo #@bar}" 8 font-lock-string-face)
   (ruby-assert-face "%s{foo #@bar}" 8 font-lock-string-face))
 
+(ert-deftest ruby-interpolation-after-dollar-sign ()
+  (ruby-assert-face "\"$#{balance}\"" 2 'font-lock-string-face)
+  (ruby-assert-face "\"$#{balance}\"" 3 'font-lock-variable-name-face))
+
 (ert-deftest ruby-no-unknown-percent-literals ()
   ;; No folding of case.
   (ruby-assert-face "%S{foo}" 4 nil)
diff --git a/test/automated/vc-bzr.el b/test/automated/vc-bzr.el
index e2ea3f6aeea..5cfa3c2691f 100644
--- a/test/automated/vc-bzr.el
+++ b/test/automated/vc-bzr.el
@@ -33,7 +33,9 @@
   (skip-unless (executable-find vc-bzr-program))
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (ignored-dir (expand-file-name "ignored-dir" tempdir))
-         (default-directory (file-name-as-directory tempdir)))
+         (default-directory (file-name-as-directory tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (make-directory ignored-dir)
@@ -64,7 +66,9 @@
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (subdir (expand-file-name "subdir" tempdir))
          (file (expand-file-name "file" tempdir))
-         (default-directory (file-name-as-directory tempdir)))
+         (default-directory (file-name-as-directory tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (call-process vc-bzr-program nil nil nil "init")
@@ -100,7 +104,9 @@
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (file (expand-file-name "foo.el" tempdir))
          (default-directory (file-name-as-directory tempdir))
-         (generated-autoload-file (expand-file-name "loaddefs.el" tempdir)))
+         (generated-autoload-file (expand-file-name "loaddefs.el" tempdir))
+         (process-environment (cons (format "BZR_LOG=%s" null-device)
+                                    process-environment)))
     (unwind-protect
         (progn
           (call-process vc-bzr-program nil nil nil "init")