Connect electric-indent-mode up with CC Mode. Bug #15478.

[gnu-emacs] / lisp / progmodes / asm-mode.el

diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 15126c4b320415eaf64ffc0bf5d1d65af6830319..ab7612082d58af09e61cd2c82acd2f9034f3544b 100644 (file)
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -1,10 +1,9 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: tools, languages
 
 ;; This file is part of GNU Emacs.
@@ -54,7 +53,7 @@
   :group 'languages)
 
 (defcustom asm-comment-char ?\;
-  "*The comment-start character assumed by Asm mode."
+  "The comment-start character assumed by Asm mode."
   :type 'character
   :group 'asm)
 
@@ -91,7 +90,7 @@
   "Keymap for Asm mode.")
 
 (defconst asm-font-lock-keywords
-  (append 
+  (append
    '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\(\\.\\sw+\\)*\\)?"
       (1 font-lock-function-name-face) (3 font-lock-keyword-face nil t))
      ;; label started from ".".
@@ -243,5 +242,4 @@ repeatedly until you are satisfied with the kind of comment."
 
 (provide 'asm-mode)
 
-;; arch-tag: 210e695f-f338-4376-8913-a4c5c72ac848
 ;;; asm-mode.el ends here