(update_frame_menubar, set_frame_menubar, xmenu_show):

[bpt/emacs.git] / lisp / elide-head.el

diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index db26eb8..9cd5920 100644 (file)
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -32,8 +32,13 @@
 ;; `elide-head'.  A buffer-local invisible overlay manages the
 ;; elision.
 
-;; Please don't turn this on in site init files so that information
-;; isn't hidden from users who may not know what it says.
+;; You might add `elide-head' to appropriate major mode hooks or to
+;; `find-file-hooks'.  Please do not do this in site init files.  If
+;; you do, information may be hidden from users who don't know it
+;; already.
+
+;; Note that `hs-minor-mode' will do a similar job by default, but
+;; it's not selective about what leading commentary it hides.
 
 ;; Inspired by jwz's hide-copyleft.el, for which we don't have an
 ;; assignment.
@@ -42,6 +47,7 @@
 
 (defgroup elide-head nil
   "Eliding copyright headers and the like in source files."
+  :version "21.1"
   :prefix "elide-head"
   :group 'tools)
 
@@ -87,7 +93,7 @@ This is suitable as an entry on `find-file-hooks' or appropriate mode hooks."
              (when (re-search-forward (caar rest) nil t)
                (setq beg (point))
                (when (re-search-forward (cdar rest) nil t)
-                 (setq end (point)
+                 (setq end (point-marker)
                        rest nil))))
            (if rest (setq rest (cdr rest))))
          (if (not (and beg end))
@@ -96,10 +102,11 @@ This is suitable as an entry on `find-file-hooks' or appropriate mode hooks."
            (goto-char beg)
            (end-of-line)
            (if (overlayp elide-head-overlay)
-               (move-overlay elide-head-overlay (point) end)
-             (setq elide-head-overlay (make-overlay (point) end)))
+               (move-overlay elide-head-overlay (point-marker) end)
+             (setq elide-head-overlay (make-overlay (point-marker) end)))
            (overlay-put elide-head-overlay 'invisible t)
            (overlay-put elide-head-overlay 'intangible t)
+           (overlay-put elide-head-overlay 'evaporate t)
            (overlay-put elide-head-overlay 'after-string "...")))))))
 
 (defun elide-head-show ()