Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25

5 files changed, 34 insertions, 8 deletions

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 4efec86f6e0..10f93d8e526 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -122,7 +122,6 @@ This variable can be a list of select methods which Gnus will query with
 the `ask-server' method in addition to the primary, secondary, and archive
 servers.
 
-
 E.g.:
   (setq gnus-check-new-newsgroups
         \\='((nntp \"some.server\") (nntp \"other.server\")))
@@ -1673,10 +1672,11 @@ backend check whether the group actually exists."
         (push (setq method-group-list (list method method-type nil nil))
               type-cache))
       ;; Only add groups that need updating.
-      (if (funcall (if one-level #'= #'<=) (gnus-info-level info)
-              (if (eq (cadr method-group-list) 'foreign)
-                  foreign-level
-                alevel))
+      (if (or (and foreign-level (null (numberp foreign-level)))
+              (funcall (if one-level #'= #'<=) (gnus-info-level info)
+                       (if (eq (cadr method-group-list) 'foreign)
+                           foreign-level
+                         alevel)))
           (setcar (nthcdr 2 method-group-list)
                   (cons info (nth 2 method-group-list)))
         ;; The group is inactive, so we nix out the number of unread articles.
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 88ed08d4429..80b52ed9561 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -990,6 +990,14 @@ comment markers."
           (goto-char (point-max))))))
   (set-marker end nil))
 
+(defun comment-make-bol-ws (len)
+  "Make a white-space string of width LEN for use at BOL.
+When `indent-tabs-mode' is non-nil, tab characters will be used."
+  (if (and indent-tabs-mode (> tab-width 0))
+      (concat (make-string (/ len tab-width) ?\t)
+              (make-string (% len tab-width) ? ))
+    (make-string len ? )))
+
 (defun comment-make-extra-lines (cs ce ccs cce min-indent max-indent &optional block)
   "Make the leading and trailing extra lines.
 This is used for `extra-line' style (or `box' style if BLOCK is specified)."
@@ -1025,8 +1033,8 @@ This is used for `extra-line' style (or `box' style if BLOCK is specified)."
           (setq cs (replace-match fill t t s)))
         (string-match re e)
         (setq ce (replace-match fill t t e))))
-    (cons (concat cs "\n" (make-string min-indent ? ) ccs)
-          (concat cce "\n" (make-string (+ min-indent eindent) ? ) ce))))
+    (cons (concat cs "\n" (comment-make-bol-ws min-indent) ccs)
+          (concat cce "\n" (comment-make-bol-ws (+ min-indent eindent)) ce))))
 
 (defmacro comment-with-narrowing (beg end &rest body)
   "Execute BODY with BEG..END narrowing.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index b08c555e34f..63f01829845 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6739,6 +6739,9 @@ comment at the start of cc-engine.el for more info."
                       (c-backward-syntactic-ws))
                     (c-back-over-list-of-member-inits)
                     (and (eq (char-before) ?:)
+                         (save-excursion
+                           (c-backward-token-2)
+                           (not (looking-at c-:$-multichar-token-regexp)))
                          (c-just-after-func-arglist-p))))
 
             (while (and (not (and level-plausible
@@ -6753,6 +6756,9 @@ comment at the start of cc-engine.el for more info."
                       (c-backward-syntactic-ws)
                       (c-back-over-list-of-member-inits)
                       (and (eq (char-before) ?:)
+                           (save-excursion
+                             (c-backward-token-2)
+                             (not (looking-at c-:$-multichar-token-regexp)))
                            (c-just-after-func-arglist-p)))))
 
             (and at-top-level level-plausible)))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index b52da3f662d..48dd9960886 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1219,6 +1219,14 @@ operators."
 (c-lang-defvar c-assignment-op-regexp
   (c-lang-const c-assignment-op-regexp))
 
+(c-lang-defconst c-:$-multichar-token-regexp
+  ;; Regexp matching all tokens ending in ":" which are longer than one char.
+  ;; Currently (2016-01-07) only used in C++ Mode.
+  t (c-make-keywords-re nil
+      (c-filter-ops (c-lang-const c-operators) t ".+:$")))
+(c-lang-defvar c-:$-multichar-token-regexp
+  (c-lang-const c-:$-multichar-token-regexp))
+
 (c-lang-defconst c-<>-multichar-token-regexp
   ;; Regexp matching all tokens containing "<" or ">" which are longer
   ;; than one char.
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 4aee2734158..b77f8e9717c 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -272,7 +272,11 @@ Use \"\\[command-apropos] picture-movement\" to see commands which control motio
         (or (eolp)
             (let ((pos (point)))
               (move-to-column col t)
-              (delete-region pos (point)))))
+              (let ((old-width (string-width (buffer-substring pos (point)))))
+                (delete-region pos (point))
+                (when (> old-width width)
+                  (insert-char ?  (- old-width width))
+                  (goto-char pos))))))
       (insert ch)
       (forward-char -1)
       (picture-move))))