Update copyright year to 2015

[gnu-emacs] / lisp / progmodes / cc-guess.el

diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el
index 4dd802ead0bb597e7f30015b48d966ac58086814..20534737d8aeb326d11b6488f62c53ceb63476a8 100644 (file)
--- a/lisp/progmodes/cc-guess.el
+++ b/lisp/progmodes/cc-guess.el
@@ -1,13 +1,12 @@
 ;;; cc-guess.el --- guess indentation values by scanning existing code
 
-;; Copyright (C) 1985, 1987, 1992-2006, 2011-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1992-2006, 2011-2015 Free Software
+;; Foundation, Inc.
 
 ;; Author:     1994-1995 Barry A. Warsaw
 ;;             2011-     Masatake YAMATO
 ;; Maintainer: bug-cc-mode@gnu.org
 ;; Created:    August 1994, split from cc-mode.el
-;; Version:    See cc-mode.el
 ;; Keywords:   c languages oop
 
 ;; This file is part of GNU Emacs.
@@ -505,8 +504,7 @@ is called with one argument, the guessed style."
                      (cond
                       ((or (and a-guessed? b-guessed?)
                            (not (or a-guessed? b-guessed?)))
-                       (string-lessp (symbol-name (car a))
-                                     (symbol-name (car b))))
+                       (string-lessp (car a) (car b)))
                       (a-guessed? t)
                       (b-guessed? nil)))))))
   style)
@@ -521,7 +519,8 @@ is called with one argument, the guessed style."
       (goto-char (point-min))
       (when (search-forward (concat "("
                                    (symbol-name (car needs-markers))
-                                   " ") nil t)
+                                   " ")
+                            nil t)
        (move-end-of-line 1)
        (comment-dwim nil)
        (insert " Guessed value"))
@@ -573,4 +572,9 @@ WITH-NAME is asked to the user."
 
 \f
 (cc-provide 'cc-guess)
+
+;;; Local Variables:
+;;; indent-tabs-mode: t
+;;; tab-width: 8
+;;; End:
 ;;; cc-guess.el ends here