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 217f9dc8b307f4581e771c6728eebbda00f1f924..4afc460779fbcd7151b6a56443656d99c3226bd2 100644 (file)
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -1,6 +1,6 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
-;; Copyright (C) 1995, 1998, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <psmith@BayNetworks.com>
 ;; Keywords: data
@@ -85,8 +85,9 @@
 ;;; Code:
 
 (eval-when-compile
-  (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)
 
 ;;;----------------------------------------------------------------------------
 ;;
@@ -540,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)