aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-05-17 20:16:09 +0000
committerGlenn Morris2008-05-17 20:16:09 +0000
commit10bd156e17467bbb819001721d74b14be8adf55f (patch)
tree805ea40f4daeddb98cff43ef02dd0754ad6a0ea1
parentfde92a81286f323552ba996bf6ebda3744a977df (diff)
downloademacs-10bd156e17467bbb819001721d74b14be8adf55f.tar.gz
emacs-10bd156e17467bbb819001721d74b14be8adf55f.zip
(elide-head-headers-to-hide): Handle GPLv3 format.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/elide-head.el9
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 821fb8580a6..99d330c627b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-05-17 Glenn Morris <rgm@gnu.org> 12008-05-17 Glenn Morris <rgm@gnu.org>
2 2
3 * elide-head.el (elide-head-headers-to-hide): Handle GPLv3 format.
4
3 * net/tramp.el (top-level): Load auth-source when compiling. 5 * net/tramp.el (top-level): Load auth-source when compiling.
4 6
5 * progmodes/fortran.el (fortran-font-lock-keywords-2): Add .eqv., .neqv. 7 * progmodes/fortran.el (fortran-font-lock-keywords-2): Add .eqv., .neqv.
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index e55ba4b9cd3..a8c09324bed 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -1,7 +1,7 @@
1;;; elide-head.el --- hide headers in files 1;;; elide-head.el --- hide headers in files
2 2
3;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 3;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;; 2006, 2007, 2008 Free Software Foundation, Inc. 4;; 2008 Free Software Foundation, Inc.
5 5
6;; Author: Dave Love <fx@gnu.org> 6;; Author: Dave Love <fx@gnu.org>
7;; Keywords: outlines tools 7;; Keywords: outlines tools
@@ -51,8 +51,9 @@
51 :group 'tools) 51 :group 'tools)
52 52
53(defcustom elide-head-headers-to-hide 53(defcustom elide-head-headers-to-hide
54 '(("is free software; you can redistribute it" . ; GNU boilerplate 54 '(("is free software[:;] you can redistribute it" . ; GNU boilerplate
55 "Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\.") 55 "\\(Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\|\
56If not, see <http://www\\.gnu\\.org/licenses/>\\)\\.")
56 ("The Regents of the University of California\\. All rights reserved\\." . 57 ("The Regents of the University of California\\. All rights reserved\\." .
57 "SUCH DAMAGE\\.") ; BSD 58 "SUCH DAMAGE\\.") ; BSD
58 ("Permission is hereby granted, free of charge" . ; X11 59 ("Permission is hereby granted, free of charge" . ; X11