Merge from origin/emacs-25

[gnu-emacs] / lisp / net / snmp-mode.el

diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 0ce0b91c037ac61f8359825f621dad20c074473e..4afc460779fbcd7151b6a56443656d99c3226bd2 100644 (file)
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -1,17 +1,16 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
-;; Copyright (C) 1995, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <psmith@BayNetworks.com>
 ;; Keywords: data
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -88,9 +85,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (require 'cl)
-  (require 'imenu)   ; Need this stuff when compiling for imenu macros, etc.
-  (require 'tempo))
+  (require 'imenu))   ; Need this stuff when compiling for imenu macros, etc.
+
+(require 'tempo)
 
 ;;;----------------------------------------------------------------------------
 ;;
@@ -144,10 +141,10 @@ This is used during Tempo template completion."
   :group 'snmp)
 
 (defvar snmp-tempo-tags nil
-  "*Tempo tags for SNMP mode.")
+  "Tempo tags for SNMP mode.")
 
 (defvar snmpv2-tempo-tags nil
-  "*Tempo tags for SNMPv2 mode.")
+  "Tempo tags for SNMPv2 mode.")
 
 
 ;; Enable fontification for SNMP MIBs
@@ -179,9 +176,9 @@ This is used during Tempo template completion."
 (defvar snmp-font-lock-keywords-3
   (append
    '(("\\([^\n]+\\)[ \t]+::=[ \t]+\\(SEQUENCE\\)[ \t]+{"
-      (1 font-lock-reference-face) (2 font-lock-keyword-face))
+      (1 font-lock-constant-face) (2 font-lock-keyword-face))
      ("::=[ \t]*{[ \t]*\\([a-z0-9].*[ \t]+\\)?\\([0-9]+\\)[ \t]*}"
-      (1 font-lock-reference-face nil t) (2 font-lock-variable-name-face)))
+      (1 font-lock-constant-face nil t) (2 font-lock-variable-name-face)))
    snmp-font-lock-keywords-2)
   "Gaudy SNMP MIB mode expression highlighting.")
 
@@ -544,8 +541,6 @@ lines for the purposes of this function."
 ;;
 ;;;----------------------------------------------------------------------------
 
-(require 'tempo)
-
 ;; Perform a completing-read with info given
 ;;
 (defun snmp-completing-read (prompt table &optional pred require init hist)
@@ -679,7 +674,7 @@ controls whether case is significant."
 ;; v2 SMI TEXTUAL-CONVENTION macro template
 ;;
 (tempo-define-template "snmpv2-textual-convention"
-  '(> (P "Texual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
+  '(> (P "Textual Convention Type: ") " ::= TEXTUAL-CONVENTION" n>
     "STATUS  "
     (if tempo-interactive
         (snmp-completing-read "Status: " snmp-mode-status-list nil t)
@@ -696,5 +691,4 @@ controls whether case is significant."
 
 (provide 'snmp-mode)
 
-;; arch-tag: eb6cc0f9-1e47-4023-8625-bc9aae6c3527
 ;;; snmp-mode.el ends here