auto upstream

6 files changed, 29 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac56cd8ba79..cef47715dc0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-06  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Only
+        propertize regexp when not inside a string (Bug#13885).
+
+2013-03-06  Alan Mackenzie  <acm@muc.de>
+
+        Correct the position of point in some line-up functions.
+        * progmodes/cc-align.el (c-lineup-whitesmith-in-block)
+        (c-lineup-assignments, c-lineup-gcc-asm-reg ): take position of
+        point at column 0 rather than at a random place in the line.
+
 2013-03-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-compat.el (tramp-compat-delete-directory): Implement
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d79a09bbfe4..870164023d5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nndir.el (nndir-request-list): Remove 2nd argument passed to
+        nnml-request-list.  (Bug#13873)
+        (nndir-request-newsgroups): Remove, unused.
+
+        * nndraft.el (nndraft-request-newsgroups): Remove, unused.
+
 2013-03-03  Ted Phelps  <phelps@gnusto.com>
 
         * shr.el: Make all the overlays set the `evaporate' property so that
diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el
index b99a0c37d2e..5e68779e977 100644
--- a/lisp/gnus/nndir.el
+++ b/lisp/gnus/nndir.el
@@ -90,8 +90,7 @@
   (nnml-request-article 0 nndir-current-group 0 0)
   (nnmh-request-group nndir-current-group 0 0)
   (nnml-close-group nndir-current-group 0)
-  (nnml-request-list (nnoo-current-server 'nndir) nndir-directory)
-  (nnml-request-newsgroups (nnoo-current-server 'nndir) nndir-directory))
+  (nnml-request-list (nnoo-current-server 'nndir)))
 
 (provide 'nndir)
 
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index ad8a8b164de..b19b56ae6ea 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -346,8 +346,7 @@ are generated if and only if they are also in `message-draft-headers'.")
    nnmh-retrieve-headers
    nnmh-request-group
    nnmh-close-group
-   nnmh-request-list
-   nnmh-request-newsgroups))
+   nnmh-request-list))
 
 (provide 'nndraft)
 
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index cdd0561a054..33836f25335 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -737,7 +737,7 @@ arglist-cont-nonempty."
               (setq startpos (c-langelem-pos langelem)))))
 
       (setq startpos (c-langelem-pos langelem)
-            endpos (point))
+            endpos (c-point 'bol))
 
       ;; Find a syntactically relevant and unnested "=" token on the
       ;; current line.  equalp is in that case set to the number of
@@ -1039,6 +1039,7 @@ brace-list-close, brace-list-intro, statement-block-intro,
 arglist-intro, arglist-cont-nonempty, arglist-close, and all in*
 symbols, e.g. inclass and inextern-lang."
   (save-excursion
+    (beginning-of-line)
     (if (and (c-go-up-list-backward)
              (= (point) (c-point 'boi)))
         nil
@@ -1191,6 +1192,7 @@ Works with: arglist-cont, arglist-cont-nonempty."
   (let ((orig-pos (point))
         alignto)
     (save-excursion
+      (beginning-of-line)
       (and
        c-opt-asm-stmt-key
 
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 9b007c0063a..6e471d1aa2a 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1276,8 +1276,10 @@ It will be properly highlighted even when the call omits parens."))
             "\\)\\s *"
             ;; The regular expression itself.
             "\\(/\\)[^/\n\\\\]*\\(?:\\\\.[^/\n\\\\]*\\)*\\(/\\)")
-           (2 (string-to-syntax "\"/"))
-           (3 (string-to-syntax "\"/")))
+           (3 (unless (nth 3 (syntax-ppss (match-beginning 2)))
+                (put-text-property (match-beginning 2) (match-end 2)
+                                   'syntax-table (string-to-syntax "\"/"))
+                (string-to-syntax "\"/"))))
           ("^=en\\(d\\)\\_>" (1 "!"))
           ("^\\(=\\)begin\\_>" (1 "!"))
           ;; Handle here documents.