aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
authorEli Zaretskii2012-11-13 16:17:18 +0200
committerEli Zaretskii2012-11-13 16:17:18 +0200
commit3c4ca7155293ffc2d04708007131bcbc882d8913 (patch)
tree61787be8cd43b6fb3d5159852fbd186eea404de7 /admin/admin.el
parent5ade42a5114255c43117065494b96d480c1e1588 (diff)
parentc708524567662c8911c5ab2695acc7bda0383705 (diff)
downloademacs-3c4ca7155293ffc2d04708007131bcbc882d8913.tar.gz
emacs-3c4ca7155293ffc2d04708007131bcbc882d8913.zip
Merge from trunk.
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 59d085b6405..ec78fb27865 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -158,6 +158,10 @@ Root must be the root of an Emacs source tree."
158 (set-version-in-file root "configure.ac" copyright 158 (set-version-in-file root "configure.ac" copyright
159 (rx (and bol "copyright" (0+ (not (in ?\"))) 159 (rx (and bol "copyright" (0+ (not (in ?\")))
160 ?\" (submatch (1+ (not (in ?\")))) ?\"))) 160 ?\" (submatch (1+ (not (in ?\")))) ?\")))
161 (set-version-in-file root "msdos/sed2v2.inp" copyright
162 (rx (and bol "/^#undef " (1+ not-newline)
163 "define COPYRIGHT" (1+ space)
164 ?\" (submatch (1+ (not (in ?\")))) ?\")))
161 (set-version-in-file root "nt/config.nt" copyright 165 (set-version-in-file root "nt/config.nt" copyright
162 (rx (and bol "#" (0+ blank) "define" (1+ blank) 166 (rx (and bol "#" (0+ blank) "define" (1+ blank)
163 "COPYRIGHT" (1+ blank) 167 "COPYRIGHT" (1+ blank)