X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/341dd15a7bd9d0b4adff846e94289b3e1877eed1..05d76dba6604f78e4b2b7b9f8b30c916cad7d32a:/lisp/elide-head.el

diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 3288a33cf0..917e813d65 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -1,17 +1,16 @@
 ;;; elide-head.el --- hide headers in files
 
-;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: outlines tools
 
 ;; 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:
 
@@ -53,8 +50,9 @@
   :group 'tools)
 
 (defcustom elide-head-headers-to-hide
-  '(("is free software; you can redistribute it" . ; GNU boilerplate
-     "Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\.")
+  '(("is free software[:;] you can redistribute it" . ; GNU boilerplate
+     "\\(Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\|\
+If not, see <http://www\\.gnu\\.org/licenses/>\\)\\.")
     ("The Regents of the University of California\\.  All rights reserved\\." .
      "SUCH DAMAGE\\.")				      ; BSD
     ("Permission is hereby granted, free of charge" . ; X11
@@ -98,7 +96,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
 			rest nil))))
 	    (if rest (setq rest (cdr rest))))
 	  (if (not (and beg end))
-	      (if (interactive-p)
+	      (if (called-interactively-p 'interactive)
 		  (message "No header found"))
 	    (goto-char beg)
 	    (end-of-line)
@@ -115,10 +113,9 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks."
   (if (and (overlayp elide-head-overlay)
 	   (overlay-buffer elide-head-overlay))
       (delete-overlay elide-head-overlay)
-    (if (interactive-p)
+    (if (called-interactively-p 'interactive)
 	(message "No header hidden"))))
 
 (provide 'elide-head)
 
-;; arch-tag: a00e6b5b-6aeb-45b1-b734-63e23df80928
 ;;; elide-head.el ends here