[Emacs-diffs] trunk r116958: Merge from emacs-24; up to r116929

[Glenn Morris]

------------------------------------------------------------
revno: 116958 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-04-08 20:37:56 -0700
message:
  Merge from emacs-24; up to r116929
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/help.el                   help.el-20091113204419-o5vbwnq5f7feedwu-280
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/electric-tests.el 
electrictests.el-20131226202454-s3cqbs9maop0w8qy-1
  test/automated/python-tests.el 
pythontests.el-20130220195218-kqcioz3fssz9hwe1-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-09 01:48:07 +0000
+++ b/lisp/ChangeLog    2014-04-09 03:37:56 +0000
@@ -1,3 +1,13 @@
+2014-04-09  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more
+       Module methods.  (Bug#17216)
+
+2014-04-09  Stefan Monnier  <address@hidden>
+
+       * help.el (describe-bindings): Fix buffer handling (bug#17210).
+       (describe-bindings-internal): Mark obsolete.
+
 2014-04-09  Stefan Monnier  <address@hidden>
 
        * subr.el (with-silent-modifications): Don't bind deactivate-mark,

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2014-04-07 20:54:16 +0000
+++ b/lisp/help.el      2014-04-09 03:37:56 +0000
@@ -482,8 +482,11 @@
   (or buffer (setq buffer (current-buffer)))
   (help-setup-xref (list #'describe-bindings prefix buffer)
                   (called-interactively-p 'interactive))
-  (with-current-buffer buffer
-    (describe-bindings-internal nil prefix)))
+  (with-help-window (help-buffer)
+    ;; Be aware that `describe-buffer-bindings' puts its output into
+    ;; the current buffer.
+    (with-current-buffer (help-buffer)
+      (describe-buffer-bindings buffer prefix))))
 
 ;; This function used to be in keymap.c.
 (defun describe-bindings-internal (&optional menus prefix)
@@ -494,6 +497,7 @@
 \(Ordinarily these are omitted from the output.)
 The optional argument PREFIX, if non-nil, should be a key sequence;
 then we display only bindings that start with that prefix."
+  (declare (obsolete describe-buffer-bindings "24.4"))
   (let ((buf (current-buffer)))
     (with-help-window (help-buffer)
       ;; Be aware that `describe-buffer-bindings' puts its output into

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2014-03-27 08:21:15 +0000
+++ b/lisp/progmodes/ruby-mode.el       2014-04-09 00:14:37 +0000
@@ -2065,6 +2065,10 @@
           "include"
           "module_function"
           "prepend"
+          "private_class_method"
+          "private_constant"
+          "public_class_method"
+          "public_constant"
           "refine"
           "using")
         'symbols))

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-04-07 21:19:31 +0000
+++ b/test/ChangeLog    2014-04-09 03:37:56 +0000
@@ -1,3 +1,11 @@
+2014-04-09  Glenn Morris  <address@hidden>
+
+       * automated/python-tests.el (python-triple-quote-pairing):
+       Enable/disable electric-pair-mode as needed.
+
+       * automated/electric-tests.el (electric-pair-backspace-1):
+       Replace deleted function.
+
 2014-04-07  João Távora  <address@hidden>
 
        * automated/python-tests.el (python-triple-quote-pairing): New test.

=== modified file 'test/automated/electric-tests.el'
--- a/test/automated/electric-tests.el  2014-04-07 20:54:16 +0000
+++ b/test/automated/electric-tests.el  2014-04-09 03:37:56 +0000
@@ -509,7 +509,7 @@
     (with-temp-buffer
       (insert "()")
       (goto-char 2)
-      (electric-pair-backward-delete-char 1)
+      (electric-pair-delete-pair 1)
       (should (equal "" (buffer-string))))))
 
 

=== modified file 'test/automated/python-tests.el'
--- a/test/automated/python-tests.el    2014-04-06 23:23:45 +0000
+++ b/test/automated/python-tests.el    2014-04-09 01:50:29 +0000
@@ -2722,30 +2722,36 @@
    (should (= (point) (point-min)))))
 
 (ert-deftest python-triple-quote-pairing ()
-  (python-tests-with-temp-buffer
-      "\"\"\n"
-    (goto-char (1- (point-max)))
-    (let ((last-command-event ?\"))
-      (call-interactively 'self-insert-command))
-    (should (string= (buffer-string)
-                     "\"\"\"\"\"\"\n"))
-    (should (= (point) 4)))
-  (python-tests-with-temp-buffer
-      "\n"
-    (let ((last-command-event ?\"))
-      (dotimes (i 3)
-        (call-interactively 'self-insert-command)))
-    (should (string= (buffer-string)
-                     "\"\"\"\"\"\"\n"))
-    (should (= (point) 4)))
-  (python-tests-with-temp-buffer
-      "\"\n\"\"\n"
-    (goto-char (1- (point-max)))
-    (let ((last-command-event ?\"))
-      (call-interactively 'self-insert-command))
-    (should (= (point) (1- (point-max))))
-    (should (string= (buffer-string)
-                     "\"\n\"\"\"\n"))))
+  (require 'electric)
+  (let ((epm electric-pair-mode))
+    (unwind-protect
+        (progn
+          (python-tests-with-temp-buffer
+           "\"\"\n"
+           (or epm (electric-pair-mode 1))
+           (goto-char (1- (point-max)))
+           (let ((last-command-event ?\"))
+             (call-interactively 'self-insert-command))
+           (should (string= (buffer-string)
+                            "\"\"\"\"\"\"\n"))
+           (should (= (point) 4)))
+          (python-tests-with-temp-buffer
+           "\n"
+           (let ((last-command-event ?\"))
+             (dotimes (i 3)
+               (call-interactively 'self-insert-command)))
+           (should (string= (buffer-string)
+                            "\"\"\"\"\"\"\n"))
+           (should (= (point) 4)))
+          (python-tests-with-temp-buffer
+           "\"\n\"\"\n"
+           (goto-char (1- (point-max)))
+           (let ((last-command-event ?\"))
+             (call-interactively 'self-insert-command))
+           (should (= (point) (1- (point-max))))
+           (should (string= (buffer-string)
+                            "\"\n\"\"\"\n"))))
+      (or epm (electric-pair-mode -1)))))
 
 
 (provide 'python-tests)