auto upstream

6 files changed, 34 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03122ff5000..f058c8632b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2012-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
+        "module" and "def" to have indentation before them.  Regression
+        from 109911 (see the new test).
+
+        * progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200).
+
+2012-12-27  Alan Mackenzie  <acm@muc.de>
+
+        Speed up fontification where there's large brace blocks.
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): Add a limit
+        to a call of c-beginning-of-decl-1.
+
 2012-12-27  Vitalie Spinu  <spinuvit@gmail.com>  (tiny change)
 
         * comint.el (comint-adjust-window-point): New function.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d95c9cdee30..a830088f3b6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2012-12-27  Glenn Morris  <rgm@gnu.org>
+
+        * plstore.el (plstore-passphrase-callback-function):
+        Use plstore-get-file.
+
+2012-12-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * nnimap.el (nnimap-find-article-by-message-id):
+        Don't error out if group is nil.
+
+        * shr.el (shr-tag-em): Render as italic, not bold.
+
 2012-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mml2015.el (mml2015-epg-key-image): Use mm-set-buffer-multibyte.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index bc0818efa7c..38ece41ad37 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -980,7 +980,7 @@ textual parts.")
 (defun nnimap-find-article-by-message-id (group message-id)
   (with-current-buffer (nnimap-buffer)
     (erase-buffer)
-    (unless (equal group (nnimap-group nnimap-object))
+    (unless (or (not group) (equal group (nnimap-group nnimap-object)))
       (setf (nnimap-group nnimap-object) nil)
       (setf (nnimap-examined nnimap-object) group)
       (nnimap-send-command "EXAMINE %S" (utf7-encode group t)))
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index f130bfca853..b428cab64e3 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -126,8 +126,7 @@ symmetric encryption will be used.")
 
 (defun plstore-passphrase-callback-function (_context _key-id plstore)
   (if plstore-cache-passphrase-for-symmetric-encryption
-      (let* ((file (file-truename (buffer-file-name
-                                   (plstore--get-buffer plstore))))
+      (let* ((file (file-truename (plstore-get-file plstore)))
              (entry (assoc file plstore-passphrase-alist))
              passphrase)
         (or (copy-sequence (cdr entry))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 2d116e1ecdc..c29e2220211 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1591,6 +1591,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
   ;; prevent a repeat invocation.  See elisp/lispref page "Search-based
   ;; Fontification".
   (let* ((paren-state (c-parse-state))
+         (decl-search-lim (c-determine-limit 1000))
          decl-context in-typedef ps-elt)
     ;; Are we in any nested struct/union/class/etc. braces?
     (while paren-state
@@ -1599,7 +1600,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
       (when (and (atom ps-elt)
                  (eq (char-after ps-elt) ?\{))
         (goto-char ps-elt)
-        (setq decl-context (c-beginning-of-decl-1)
+        (setq decl-context (c-beginning-of-decl-1 decl-search-lim)
               in-typedef (looking-at c-typedef-key))
         (if in-typedef (c-forward-token-2))
         (when (and c-opt-block-decls-with-vars-key
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index b223aece416..5cba1df3c8f 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -7,7 +7,7 @@
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode
 ;; Created: Fri Feb  4 14:49:13 JST 1994
 ;; Keywords: languages ruby
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -64,8 +64,9 @@
   "Regexp to match keywords that nest without blocks.")
 
 (defconst ruby-indent-beg-re
-  (concat "^\\s *" (regexp-opt '("class" "module" "def" "if" "unless" "case"
-                                 "while" "until" "for" "begin")) "\\_>")
+  (concat "^\\(\\s *" (regexp-opt '("class" "module" "def")) "\\|"
+          (regexp-opt '("if" "unless" "case" "while" "until" "for" "begin"))
+          "\\)\\_>")
   "Regexp to match where the indentation gets deeper.")
 
 (defconst ruby-modifier-beg-keywords