merge trunk

3 files changed, 51 insertions, 71 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 834695d6c78..661cde9c43e 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -90,7 +90,6 @@ BROKEN_GETWD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
-BROKEN_SA_RESTART
 CLASH_DETECTION
 DATA_SEG_BITS
 DATA_START
@@ -434,7 +433,6 @@ PTY_OPEN
 PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
-SA_RESTART
 SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
 SIGALRM
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 25eed8af5e3..7f30fe8fc0f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,27 @@
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-log-time-format): Declare.
+
+        * admin.el (cusver-scan, cusver-check): Bind local variables.
+
+        * admin.el (set-version): Set major version in
+        etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
+        (set-copyright): In etc/refcards, only change ru-refcard.tex
+        and emacsver.tex.
+
+        * admin.el (set-copyright): No more need to set copyrights for
+        nextstep, or .c files.  Add configure.ac and config.nt.
+
+2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove configure's --without-sync-input option (Bug#12450).
+        * CPP-DEFINES (BROKEN_SA_RESTART, SA_RESTART): Remove.
+
+2012-09-16  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (set-version): No more need to set nextstep versions.
+        (set-copyright): Update for moved nextstep files.
+
 2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify SIGIO usage (Bug#12408).
diff --git a/admin/admin.el b/admin/admin.el
index 6d729214bd0..862e5aed6c1 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -26,6 +26,8 @@
 
 ;;; Code:
 
+(defvar add-log-time-format)            ; in add-log
+
 (defun add-release-logs (root version)
   "Add \"Version VERSION released.\" change log entries in ROOT.
 Root must be the root of an Emacs source tree."
@@ -126,39 +128,16 @@ Root must be the root of an Emacs source tree."
     (set-version-in-file root "nt/emacsclient.rc" comma-space-version
                          (rx (and "\"ProductVersion\"" (0+ space) ?,
                                   (0+ space) ?\" (submatch (1+ (in "0-9, ")))
-                                  "\\0\""))))
-  ;; nextstep.
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
-   version (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space)
-                    (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
-   version (rx (and "CFBundleShortVersionString" (1+ not-newline) ?\n
-                    (0+ not-newline) "<string>" (0+ space)
-                    (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
-   version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space)
-                    ?\" (0+ space) "Version" (1+ space)
-                    (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
-   version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space)
-                    ?\" (0+ space) "Emacs version" (1+ space)
-                    (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
-   version (rx (and "ApplicationRelease" (0+ space) ?= (0+ space)
-                    ?\" (0+ space) (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
-   version (rx (and "FullVersionID" (0+ space) ?= (0+ space)
-                    ?\" (0+ space) "Emacs" (1+ space)
-                    (submatch (1+ (in "0-9."))))))
-  (set-version-in-file
-   root "nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop"
-   version (rx (and "Version=" (submatch (1+ (in "0-9.")))))))
+                                  "\\0\"")))
+    (when (string-match "\\([0-9]\\{2,\\}\\)" version)
+      (setq version (match-string 1 version))
+      (set-version-in-file root "etc/refcards/ru-refcard.tex" version
+                           "\\\\newcommand{\\\\versionemacs}\\[0\\]\
+{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")
+      (set-version-in-file root "etc/refcards/emacsver.tex" version
+                           "\\\\def\\\\versionemacs\
+{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs"))))
+
 
 ;; Note this makes some assumptions about form of short copyright.
 (defun set-copyright (root copyright)
@@ -172,45 +151,24 @@ Root must be the root of an Emacs source tree."
                          (format-time-string "%Y")))))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
-  (set-version-in-file root "src/emacs.c" copyright
-                       (rx (and "emacs_copyright" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
-  (set-version-in-file root "lib-src/ebrowse.c" copyright
-                       (rx (and "emacs_copyright" (0+ (not (in ?\")))
-                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
-  (set-version-in-file root "lib-src/etags.c" copyright
-                       (rx (and "emacs_copyright" (0+ (not (in ?\")))
+  (set-version-in-file root "configure.ac" copyright
+                       (rx (and bol "copyright" (0+ (not (in ?\")))
                                 ?\" (submatch (1+ (not (in ?\")))) ?\")))
+  (set-version-in-file root "nt/config.nt" copyright
+                       (rx (and bol "#" (0+ blank) "define" (1+ blank)
+                                "COPYRIGHT" (1+ blank)
+                                ?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/rcs2log" copyright
                        (rx (and "Copyright" (0+ space) ?= (0+ space)
                                 ?\' (submatch (1+ nonl)))))
-  ;; This one is a nuisance, as it needs to be split over two lines.
-  (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
-  ;; nextstep.
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
-   copyright (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space)
-                    (1+ (in "0-9.")) (1+ space)
-                    (submatch (1+ (not (in ?\<)))))))
-  (set-version-in-file
-   root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
-   copyright (rx (and "NSHumanReadableCopyright" (0+ space) ?\= (0+ space)
-                    ?\" (submatch (1+ (not (in ?\")))))))
-  (set-version-in-file
-   root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
-   copyright (rx (and "Copyright" (0+ space) ?\= (0+ space)
-                      ?\" (submatch (1+ (not (in ?\")))))))
   (when (string-match "\\([0-9]\\{4\\}\\)" copyright)
     (setq copyright (match-string 1 copyright))
-    (dolist (file (directory-files (expand-file-name "etc/refcards" root)
-                                   t "\\.tex\\'"))
-      (unless (string-match "gnus-refcard\\.tex" file)
-        (set-version-in-file
-         root file copyright
-         (concat (if (string-match "ru-refcard\\.tex" file)
-                     "\\\\newcommand{\\\\cyear}\\[0\\]{"
-                   "\\\\def\\\\year{")
-                 "\\([0-9]\\{4\\}\\)}.+%.+copyright year"))))))
+    (set-version-in-file root "etc/refcards/ru-refcard.tex" copyright
+                         "\\\\newcommand{\\\\cyear}\\[0\\]\
+{\\([0-9]\\{4\\}\\)}.+%.+copyright year")
+    (set-version-in-file root "etc/refcards/emacsver.tex" copyright
+                         "\\\\def\\\\year\
+{\\([0-9]\\{4\\}\\)}.+%.+copyright year")))
 
 ;;; Various bits of magic for generating the web manuals
 
@@ -459,7 +417,7 @@ Also generate PostScript output in PS-DEST."
         (setq done t))
        (t
         (if (eobp)
-            (error "Parse error in %s" f))
+            (error "Parse error in %s" f)) ; f is bound in manual-html-node
         (unless open-td
           (setq done t))))
       (forward-line 1))))
@@ -491,7 +449,7 @@ If optional argument OLD is non-nil, also scan for defvars."
   (let ((m (format "Scanning %s..." file))
         (re (format "^[ \t]*\\((def%s\\)[ \t\n]"
                     (if old "\\(?:custom\\|var\\)" "custom")))
-        alist var ver)
+        alist var ver form)
     (message "%s" m)
     (with-temp-buffer
       (insert-file-contents file)
@@ -550,7 +508,7 @@ changes (in a non-trivial way).  This function does not check for that."
                         (mapcar
                          (lambda (file)
                            (cons file (cusver-scan file))) newfiles)))
-         oldcus result thisfile)
+         oldcus result thisfile file)
     (message "Reading old defcustoms...")
     (dolist (file oldfiles)
       (setq oldcus (append oldcus (cusver-scan file t))))