; Revert "Use eldoc-documentation-functions"

[gnu-emacs] / lisp / elide-head.el

diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index e55ba4b9cd31218529532855eeb04d3400cbec4d..917e813d65cc73da5da7286df9934cd0f3b332c2 100644 (file)
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -1,7 +1,6 @@
 ;;; 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
@@ -51,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
@@ -96,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)
@@ -113,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